757 files changed, 702 insertions, 5526 deletions

diff --git a/Makefile b/Makefile
index 32583d1c..ffb4cf25 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ KEY=/opt/swamid-credentials/swamid-signer.key
 CERT=/opt/swamid-credentials/swamid-signer.crt
 PASS=$(shell cat /opt/swamid-credentials/swamid-signer-pass.txt)
 DEST=/opt/published-metadata
-SRCDIRS=swamid-1.0 swamid-2.0 nya-1.0
+SRCDIRS=swamid-2.0
 
 DAYS:=1
 DATE=$(shell perl scripts/expiration_date.pl $(DAYS))
@@ -23,7 +23,7 @@ keys: $(KEY) $(CERT)
 
 MXML=$(shell echo *.mxml)
 
-sign: keys swamid nocache nya nya-testing swamid-testing swamid-testing-idp upstream projects swamid-ki-sll
+sign: keys swamid swamid-testing swamid-testing-idp upstream projects swamid-ki-sll
 
 %.sig: %.mxml
 	xsltproc $(XSLTDEFS) --xinclude $(TRANSFORM) $< > $*.n
@@ -45,10 +45,6 @@ kalmar:
 edugain:
 	$(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
 
-nocache:
-	#$(MAKE) swamid-1.0-nocache.pub
-	rm -f $(DEST)/swamid-1.0-nocache.xml
-
 projects:
 	$(MAKE) RPI=false CONTACTS=false TOU=false ORG=false swamid-fiv-test.pub
 
@@ -70,28 +66,17 @@ swamid-interfederations1:
 swamid-interfederations2:
 	scripts/aggregate.sh swamid-interfederations-2.0
 
-swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-discovery swamid-idp swamid-idp-transitive publish
+swamid: swamid2 swamid-no-interfederation-combined swamid-discovery swamid-idp swamid-idp-transitive publish
 
 publish: swamid-tou-en.txt swamid-tou-sv.txt HEADER.html README.html
 	cp swamid-tou-en.txt swamid-tou-sv.txt sunet-swamid.png HEADER.html README.html $(DEST)
 
-swamid1:
-	@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	#@test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST)
-	rm -f $(DEST)/swamid-1.0.xml
-
-swamid2-deps: swamid-sp-1.0.xml swamid-idp-1.0.xml swamid-externals-sp-2.0.xml swamid-interfederations-idp-2.0.xml
+swamid2-deps: swamid-externals-sp-2.0.xml swamid-interfederations-idp-2.0.xml
 
 swamid2: swamid2-deps
 	@saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
 	@test -s swamid-2.0.xml && cp swamid-2.0.xml $(DEST)
 
-swamid-sp-1.0.xml:
-	@xsltproc --xinclude xslt/extract-non-idp.xslt swamid-1.0.mxml > swamid-sp-1.0.xml
-
-swamid-idp-1.0.xml:
-	@xsltproc --xinclude xslt/extract-idp.xslt swamid-1.0.mxml > swamid-idp-1.0.xml
-
 swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml
 	@xsltproc --xinclude xslt/extract-idp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-idp-2.0.xml
 
@@ -114,16 +99,6 @@ swamid-idp-transitive: swamid2-deps
 	@saml-md-tool swamid-idp-transitive update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
 	test -s swamid-idp-transitive.xml && cp swamid-idp-transitive.xml $(DEST)
 
-nya:
-	@saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	#@test -s nya-1.0.xml && cp nya-1.0.xml $(DEST)
-	rm -f $(DEST)/nya-1.0.xml
-
-nya-testing:
-	@saml-md-tool nya-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	#@test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST)
-	rm -f $(DEST)/nya-1.0-testing.xml
-
 swamid-testing:
 	@saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-testing-1.0.xml && cp swamid-testing-1.0.xml $(DEST)
diff --git a/NewMakefileWithSp b/NewMakefileWithSp
deleted file mode 100644
index 1341812e..00000000
--- a/NewMakefileWithSp
+++ /dev/null
@@ -1,73 +0,0 @@
-
-KEY=/opt/swamid-credentials/swamid-signer.key
-CERT=/opt/swamid-credentials/swamid-signer.crt
-PASS=$(shell cat /opt/swamid-credentials/swamid-signer-pass.txt)
-DEST=/opt/published-metadata
-
-all: update clean sign
-
-update:
-#	@svn up -q
-
-keys: $(KEY) $(CERT)
-
-MXML=$(shell echo *.mxml)
-
-sign: keys swamid nya swamid-compat nya-testing old-swamid-testing swamid-testing swamid-testing-idp swamid-testing-sp swamid-kalmar swamid-edugain-testing swamid-ki-sll
-
-urn-mace-swami.se-swamid-test-1.0-metadata.mxml:
-	@sed 's!http://md.swamid.se/md/swamid-1.0.xml!urn:mace:swami.se:swamid:test-1.0!g' < swamid-1.0.mxml > urn-mace-swami.se-swamid-test-1.0-metadata.mxml
-
-swamid-compat: urn-mace-swami.se-swamid-test-1.0-metadata.mxml
-	@saml-md-tool urn-mace-swami.se-swamid-test-1.0-metadata update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml $(DEST)/urn-mace-swami.se-swamid-test-1.0-metadata.xml
-	@test -s urn-mace-swami.se-swamid-test-1.0-metadata.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata.xml $(DEST)/urn-mace-swami.se-swamid-test-1.0-metadata-signed.xml
-	@rm -f urn-mace-swami.se-swamid-test-1.0-metadata.mxml
-
-swamid:
-	@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST)
-	@test -s swamid-1.0-unsigned.xml && cp swamid-1.0-unsigned.xml $(DEST)
-
-nya:
-	@saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s nya-1.0.xml && cp nya-1.0.xml $(DEST)
-	@test -s nya-1.0-unsigned.xml && cp nya-1.0-unsigned.xml $(DEST)
-
-nya-testing:
-	@saml-md-tool nya-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST)
-
-swamid-testing:
-	@saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-testing-1.0.xml && cp swamid-testing-1.0.xml $(DEST)
-
-swamid-testing-idp:
-	@saml-md-tool swamid-testing-idp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-testing-idp-1.0.xml && cp swamid-testing-idp-1.0.xml $(DEST)
-
-swamid-testing-sp:
-	@saml-md-tool swamid-testing-sp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-testing-sp-1.0.xml && cp swamid-testing-sp-1.0.xml $(DEST)
-
-old-swamid-testing:
-	@saml-md-tool swamid-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-1.0-testing.xml && cp swamid-1.0-testing.xml $(DEST)
-
-swamid-edugain-testing:
-	@saml-md-tool swamid-edugain-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-edugain-testing-1.0.xml && cp swamid-edugain-testing-1.0.xml $(DEST)
-
-swamid-kalmar:
-	@saml-md-tool swamid-kalmar-1.0 update --days=2 --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-kalmar-1.0.xml && cp swamid-kalmar-1.0.xml $(DEST)
-
-swamid-ki-sll:
-	@saml-md-tool swamid-ki-sll-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
-	@test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml $(DEST)
-
-test:
-	@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema  schema.xsd $$x; done
-
-clean:
-	@rm -f *.xml
diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
deleted file mode 100644
index 29aa454e..00000000
--- a/nya-1.0-testing.mxml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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/nya-1.0.xml">
-  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shib1.oru.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp-nya.bth.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/accountcheckout.lnu.se.xml"/>
-  <xi:include href="swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/registrera.hb.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/aktivering.db.umu.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/nb10.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nb10.ladok.umu.se-shibboleth-sp.xml"/>
-  <xi:include href="nya-1.0/ft10.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/ft10.ladok.umu.se-shibboleth-sp.xml"/>
-  <xi:include href="nya-1.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-sp-test.oru.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-03.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/portal.mdh.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/nya-00.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-00.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-00.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-08.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-08.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/ab11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/ab11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/ab11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/at11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/at11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/at11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/ft11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/ft11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/ft11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/it11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/it11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/it11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-01.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-01.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-02.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-02.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-03.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-04.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-04.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-05.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-05.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-06.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-06.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-07.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-07.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-08.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-08.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-09.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-09.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-10.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-10.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/wb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/vhs-shib.no-ip.org-shibboleth-sp.xml"/>
-  <xi:include href="nya-1.0/vhs-dev01.dyndns.org-shibboleth-sp.xml"/>
-  <xi:include href="nya-1.0/wb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/wb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-</EntitiesDescriptor>
diff --git a/nya-1.0.mxml b/nya-1.0.mxml
deleted file mode 100644
index 46af250b..00000000
--- a/nya-1.0.mxml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/nya-1.0.xml">
-  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shib1.oru.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp-nya.bth.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/accountcheckout.lnu.se.xml"/>
-  <xi:include href="swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/registrera.hb.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/aktivering.db.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nacho.adm.gu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/portal.mdh.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/sp.it.gu.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/dwidp.antagning.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="nya-1.0/www.antagning.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/aktivera-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="nya-1.0/aktivera.su.se-shibboleth.sso.xml"/>
-  <xi:include href="nya-1.0/www.servicedesk.umdac.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/account.mdh.se-shibboleth.xml"/>
-</EntitiesDescriptor>
diff --git a/nya-1.0/ab11.ladok.umu.se-dw-idp.xml b/nya-1.0/ab11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 61154f21..00000000
--- a/nya-1.0/ab11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 6de90d72..00000000
--- a/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/at11.ladok.umu.se-dw-idp.xml b/nya-1.0/at11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index a0df0b50..00000000
--- a/nya-1.0/at11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index a95dde2d..00000000
--- a/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml b/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 28644fba..00000000
--- a/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testc.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.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://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.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>
-</EntityDescriptor>
diff --git a/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml b/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 20b637e3..00000000
--- a/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testd.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.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://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.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>
-</EntityDescriptor>
diff --git a/nya-1.0/ft11.ladok.umu.se-dw-idp.xml b/nya-1.0/ft11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 2f5767ba..00000000
--- a/nya-1.0/ft11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 4780047e..00000000
--- a/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/it11.ladok.umu.se-dw-idp.xml b/nya-1.0/it11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index f0c05c19..00000000
--- a/nya-1.0/it11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index d5bbbee5..00000000
--- a/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nb11.ladok.umu.se-dw-idp.xml b/nya-1.0/nb11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 6008f497..00000000
--- a/nya-1.0/nb11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index fbde652b..00000000
--- a/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-00.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-00.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 8db1d9c1..00000000
--- a/nya-1.0/nya-00.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczOTAwWhcNMjAwODE3MDczOTAwWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANY0KZ8GRYywPHPb9MFyDyDQh54/V+QaGZL+JoswMKt5WUbRk1vAfNkZs3G1r+hZD/A7OpN1y1BvSlyJbS9sp9MCAwEAAaN/MH0wHQYDVR0OBBYEFK4PAAaCkwmSI6jNntGSYRxN85siME4GA1UdIwRHMEWAFK4PAAaCkwmSI6jNntGSYRxN85sioSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmVOjZUHCxT4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABub7gUiIQO2J+G5P8sw78pWegH4WPwAVXYPqkdj49vJ0R9xz2sB1o2lCz3cM2iVvXZQCtoHKM38typf1QGeG30=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczOTAwWhcNMjAwODE3MDczOTAwWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANY0KZ8GRYywPHPb9MFyDyDQh54/V+QaGZL+JoswMKt5WUbRk1vAfNkZs3G1r+hZD/A7OpN1y1BvSlyJbS9sp9MCAwEAAaN/MH0wHQYDVR0OBBYEFK4PAAaCkwmSI6jNntGSYRxN85siME4GA1UdIwRHMEWAFK4PAAaCkwmSI6jNntGSYRxN85sioSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmVOjZUHCxT4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABub7gUiIQO2J+G5P8sw78pWegH4WPwAVXYPqkdj49vJ0R9xz2sB1o2lCz3cM2iVvXZQCtoHKM38typf1QGeG30=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index b2ac7536..00000000
--- a/nya-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczNzMxWhcNMjAwODE3MDczNzMxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmf57Rs0mLLo/bCWjeRD/31lxnKa+qCzbu/Kw7SuNfmrsoM8XRQZsttJ0W205vVS/KeWTD5lwvMeKt0unFqKj8CAwEAAaN/MH0wHQYDVR0OBBYEFDP6RZyMAof7vHj6IL/aqJRp92GUME4GA1UdIwRHMEWAFDP6RZyMAof7vHj6IL/aqJRp92GUoSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmF+iiXS05WUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJUO13OwzqCiSKk/JDRhWSIS1Ayzlq8dDkGzfdUcgaFtcBKwcPTBoudm1WhClGvcTAz+QTmNq9NsJurYJ3j5uQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALEdXhcAAnYWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwOTA5MTQxNDQzWhcNMjAwOTA2MTQxNDQzWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALMCCTNNa9jjqiqYmO2ZV5jh21wkQ7GamgoVe3FWfGab5NkB8gsLnt4sFA7Dvv931rfY9zH4HonP1wfyWnXQSdUCAwEAAaN/MH0wHQYDVR0OBBYEFHheL3GseoySXgM64QL4bOjCOOJ1ME4GA1UdIwRHMEWAFHheL3GseoySXgM64QL4bOjCOOJ1oSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAsR1eFwACdhYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE5MEcsdWrOLllQAsWB4UXXjXRxystILjXLswnpJ+d5Fib5reXG40y6pw4u9e4xLcoyDYFgcfIjkQIKz4PglQ60=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczNzMxWhcNMjAwODE3MDczNzMxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmf57Rs0mLLo/bCWjeRD/31lxnKa+qCzbu/Kw7SuNfmrsoM8XRQZsttJ0W205vVS/KeWTD5lwvMeKt0unFqKj8CAwEAAaN/MH0wHQYDVR0OBBYEFDP6RZyMAof7vHj6IL/aqJRp92GUME4GA1UdIwRHMEWAFDP6RZyMAof7vHj6IL/aqJRp92GUoSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmF+iiXS05WUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJUO13OwzqCiSKk/JDRhWSIS1Ayzlq8dDkGzfdUcgaFtcBKwcPTBoudm1WhClGvcTAz+QTmNq9NsJurYJ3j5uQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALEdXhcAAnYWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwOTA5MTQxNDQzWhcNMjAwOTA2MTQxNDQzWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALMCCTNNa9jjqiqYmO2ZV5jh21wkQ7GamgoVe3FWfGab5NkB8gsLnt4sFA7Dvv931rfY9zH4HonP1wfyWnXQSdUCAwEAAaN/MH0wHQYDVR0OBBYEFHheL3GseoySXgM64QL4bOjCOOJ1ME4GA1UdIwRHMEWAFHheL3GseoySXgM64QL4bOjCOOJ1oSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAsR1eFwACdhYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE5MEcsdWrOLllQAsWB4UXXjXRxystILjXLswnpJ+d5Fib5reXG40y6pw4u9e4xLcoyDYFgcfIjkQIKz4PglQ60=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index fe759eb5..00000000
--- a/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index a1516c2d..00000000
--- a/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 2ee6e6b8..00000000
--- a/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 06322916..00000000
--- a/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-03.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-03.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index a32b39da..00000000
--- a/nya-1.0/nya-03.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTE5MTIyNDI2WhcNMjAwNTE2MTIyNDI2WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALkPGJdT2+8T/Tm5sEsm9Xtey1o7tzveQvmX3I8iJ89AdD2u7ZUNp5WNQv8/q0D2l+dU3TC+Zo3gPRzrL9rFWG0CAwEAAaN/MH0wHQYDVR0OBBYEFD+i/0toSkdU7jydFxT3Isa+PFIaME4GA1UdIwRHMEWAFD+i/0toSkdU7jydFxT3Isa+PFIaoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAhAzBsjMYSWIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADN2AhE4tEt2aTScozETDBHxPpKa0Tb6qr6Z71nYmm4a+EdL2D7rQuxtE1M9sn8RJ2dw+xrsTsMQv0TzER2N6ZQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTE5MTIyNDI2WhcNMjAwNTE2MTIyNDI2WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALkPGJdT2+8T/Tm5sEsm9Xtey1o7tzveQvmX3I8iJ89AdD2u7ZUNp5WNQv8/q0D2l+dU3TC+Zo3gPRzrL9rFWG0CAwEAAaN/MH0wHQYDVR0OBBYEFD+i/0toSkdU7jydFxT3Isa+PFIaME4GA1UdIwRHMEWAFD+i/0toSkdU7jydFxT3Isa+PFIaoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAhAzBsjMYSWIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADN2AhE4tEt2aTScozETDBHxPpKa0Tb6qr6Z71nYmm4a+EdL2D7rQuxtE1M9sn8RJ2dw+xrsTsMQv0TzER2N6ZQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 1df97c1d..00000000
--- a/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 349fbc42..00000000
--- a/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 09564584..00000000
--- a/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 06e54423..00000000
--- a/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 8ddf75b8..00000000
--- a/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 4bf2c646..00000000
--- a/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 33708258..00000000
--- a/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index ade7951b..00000000
--- a/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 2c46d474..00000000
--- a/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index cb8e57b7..00000000
--- a/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index c2578b5f..00000000
--- a/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 8ae24b34..00000000
--- a/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 94e097e4..00000000
--- a/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index feb4900a..00000000
--- a/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/shib-idp-test.oru.se-idp-shibboleth.xml b/nya-1.0/shib-idp-test.oru.se-idp-shibboleth.xml
deleted file mode 100644
index b0198c2c..00000000
--- a/nya-1.0/shib-idp-test.oru.se-idp-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" xmlns:ds="http://www.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-idp-test.oru.se/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">oru.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
-NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALts6ImCj550QsZC
-XZKfS0Id5pK3v9rRTSNs6em5F5kR1YLSpNjNmDh7Ly0VM2tHdvF07aQ+0db/lL/C
-1I4w8CjapJl7FtrZR7m5p0MSzoFZD6YO9bdVPx5fXTibUV1pmHOQwzTwvzpKwK7b
-teVTxm5AbZv4MIdHkCruL+j3ULs5Av70AEZqYLZrDsZB4jRj5lrEU3TKWGR9hogt
-FR7mwF29CAyBozOREGtlnyh6dpiPNbEyYogXYHEiO01fuA9YCbjKkLbT6JihZ1Sr
-pulCuNRpSRobmTXx3dqNSEKAtwCPhkACpSjxLRhWhiz/yCTq2Gtnfj/AJ8LbN82d
-ub0uVqcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYi1pZHAtdGVzdC5vcnUuc2WG
-K2h0dHBzOi8vc2hpYi1pZHAtdGVzdC5vcnUuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFNCO/POVajXZInMq3ou0SdInZHIVMA0GCSqGSIb3DQEBBQUAA4IBAQCw
-vt65eqgtN1+QFyq5dmVXZ6LtggHupoVsYMtwS1hxDqsogsMBG8Q8HKZTSOIHxOJZ
-PwCTZuP93xWqa5r0D4w8W/4FxhpR3gnBzF9KSLSJ+zb99+f/6oxpTMMIcQjear+8
-Dp+2X1kVXtrJ8jhI0/ZDyAEYDv9OB5fLWjg7PworfuOm+bcYUXxdyTstkuMqaKuY
-LkDtPwQOSlQTw2opovGRVI7hHT89tkL3LY53RHSOz3T08J8PrWuggUO3zcpIfIGa
-tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
-vs6Y0aXUmx4uTVjZQtbc
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.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-test.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-test.oru.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
-NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALts6ImCj550QsZC
-XZKfS0Id5pK3v9rRTSNs6em5F5kR1YLSpNjNmDh7Ly0VM2tHdvF07aQ+0db/lL/C
-1I4w8CjapJl7FtrZR7m5p0MSzoFZD6YO9bdVPx5fXTibUV1pmHOQwzTwvzpKwK7b
-teVTxm5AbZv4MIdHkCruL+j3ULs5Av70AEZqYLZrDsZB4jRj5lrEU3TKWGR9hogt
-FR7mwF29CAyBozOREGtlnyh6dpiPNbEyYogXYHEiO01fuA9YCbjKkLbT6JihZ1Sr
-pulCuNRpSRobmTXx3dqNSEKAtwCPhkACpSjxLRhWhiz/yCTq2Gtnfj/AJ8LbN82d
-ub0uVqcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYi1pZHAtdGVzdC5vcnUuc2WG
-K2h0dHBzOi8vc2hpYi1pZHAtdGVzdC5vcnUuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFNCO/POVajXZInMq3ou0SdInZHIVMA0GCSqGSIb3DQEBBQUAA4IBAQCw
-vt65eqgtN1+QFyq5dmVXZ6LtggHupoVsYMtwS1hxDqsogsMBG8Q8HKZTSOIHxOJZ
-PwCTZuP93xWqa5r0D4w8W/4FxhpR3gnBzF9KSLSJ+zb99+f/6oxpTMMIcQjear+8
-Dp+2X1kVXtrJ8jhI0/ZDyAEYDv9OB5fLWjg7PworfuOm+bcYUXxdyTstkuMqaKuY
-LkDtPwQOSlQTw2opovGRVI7hHT89tkL3LY53RHSOz3T08J8PrWuggUO3zcpIfIGa
-tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
-vs6Y0aXUmx4uTVjZQtbc
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.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>
-</EntityDescriptor>
diff --git a/nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index efefea22..00000000
--- a/nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.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.testc.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.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://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.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>
-</EntityDescriptor>
diff --git a/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 83efac1d..00000000
--- a/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.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.testd.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.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://shibboleth.testd.ladok.umu.se:444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testd.ladok.umu.se: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 regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.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>
-</EntityDescriptor>
diff --git a/nya-1.0/wb11.ladok.umu.se-dw-idp.xml b/nya-1.0/wb11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index fa8a4c8f..00000000
--- a/nya-1.0/wb11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/dw-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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 95c5f3ec..00000000
--- a/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/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>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-1.0-nocache.mxml b/swamid-1.0-nocache.mxml
deleted file mode 100644
index adf24907..00000000
--- a/swamid-1.0-nocache.mxml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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-1.0.xml">
-  <xi:include href="swamid-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
-</EntitiesDescriptor>
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
deleted file mode 100644
index d78f575c..00000000
--- a/swamid-1.0.mxml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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-1.0.xml"
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H">
-  <xi:include href="swamid-1.0/order.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/dedserv79.levonline.com-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/mondo.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/mondo-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/ensky.lhs.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.wisum.umdac.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/beta.augustus.se.xml"/>
-  <xi:include href="swamid-1.0/dspace.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/lists.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/pp-komm-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/www.sub.su.se.xml"/>
-  <xi:include href="swamid-1.0/samsok.libris.kb.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
-  <xi:include href="swamid-1.0/mondo-web.it.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/cbs-vylvatest.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/labs.swami.se.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.ebscohost.com.xml"/>
-  <xi:include href="swamid-1.0/www3.genuinetext.com-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.secure.su.se-identity.xml"/>
-  <xi:include href="swamid-1.0/umdac-humpdac.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp.lhs.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/moodle.lhs.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/www.cambro.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/cambro-utv1.umdc.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/kurser.math.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/kurser3.math.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/webwork.math.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/webwork2.math.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/etenta.math.su.se"/>
-  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/login.liu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/converis.info-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp.wavelan.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/samadhi.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.nordu.net-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/tcs-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/identity.mdh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/signon.hh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.lnu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/hbidp.hb.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-1.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-1.0/shibb1.hj.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/bibliometrics.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/uu.test.diva-portal.org-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.bth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.student.bth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/www4.genuinetext.com-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/beta.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/su.avedas.com-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/registrera.hb.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/aktivering.db.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.hgo.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.diva-portal.org-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/pp-edu-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/minastudier-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/ladok-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/cambro-tst1.umdc.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/login.proxy.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nordushare-dev.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/pp-migr-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/pp-test-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/mail.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/sp.tools.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/publications.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/pp-prod-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/brainstorm.swami.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/beta.lobber.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.his.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www07test.sub.su.se.xml"/>
-  <xi:include href="swamid-1.0/sp.kau.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/fordrop.irt.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/minastudier.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/ladok.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/bardo.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/mailfilter-test.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/unitcf.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/crowd.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/rt-test-app1.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/portal.mdh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/confluence.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/jira.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/mailfilter.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/jira-test.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/rt.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/swamid.shh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ilearn.dsv.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.mah.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect.uninett.no-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nagios.dev.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/idp2.kau.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.it.su.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/dev.lobber.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/kiidp.ki.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ws3.bmc.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp-test.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/smd-dev.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/vlab-chemsub.explizit.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp.it.gu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/monitor.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/coip-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.hkr.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/betafoo.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.chalmers.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp2.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/login.du.se-idp-shibboleth.xml"/>
-  <xi:include href="nya-1.0/www.antagning.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/idp.irf.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/crowdtest.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.suni.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-1.0/sp-test.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/lingon.ladok.umu.se-8087-sp.xml"/>
-  <xi:include href="swamid-1.0/ni.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/jabber.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/epc.ub.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/expert.antagning.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/its-pd0001.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/umdac-olho0001.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.wisum.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/lpw.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nordunet.tv-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/mailfilter.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sutest.dsv.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.antagning.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/mds.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/meta.eduroam.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/meetingtools.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/play.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/smd.du.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/mds.lan.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ws3.bmc.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/mds-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/play.liu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/account.liu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nagios-vm.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/amiga.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.universityadmissions.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/its-pd0030.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nagios.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
-  <xi:include href="swamid-1.0/its-pd0062.ad.umu.se-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/captivelan-test.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/pingpong.chalmers.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-1.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/vfu-gemdev.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/alpha.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.play.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
-  <xi:include href="swamid-1.0/play.hig.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/maps.slu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/play.hb.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/betafoo.nordu.net-saml2-metadata.xml"/>
-  <xi:include href="swamid-1.0/vfu-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/vfu.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/captivelan.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-1.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
-  <xi:include href="swamid-1.0/mds2.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/cdn.nordunet.tv-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/gallus.scilifelab.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/play.mah.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ni.nordu.net-saml2-metadata.xml"/>
-  <xi:include href="swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml"/>
-  <xi:include href="swamid-1.0/play.mdh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/play.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect-beta.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/akka-anv.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect-stable.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp2.hv.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp3.hv.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/account.mdh.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-1.0/testakt.it.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/testgag.it.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.konstfack.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.rkh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.kmh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/download.portal.chalmers.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.antagning.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/portalservicesutv.miun.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml"/>
-  <xi:include href="swamid-1.0/lpwdev.it.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/kilwdev.it.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/test-ki.pingpong.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/hr.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/aktivera.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/selfservice.hb.se-shibboleth.xml"/>
-</EntitiesDescriptor>
diff --git a/swamid-1.0/ab11.ladok.umu.se-aws-sp.xml b/swamid-1.0/ab11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4ed32872..00000000
--- a/swamid-1.0/ab11.ladok.umu.se-aws-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://ab11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
-NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
-vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
-jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
-ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
-JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
-INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
-KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
-qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
-cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
-bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
-lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
-oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
-</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>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
-NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
-vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
-jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
-ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
-JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
-INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
-KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
-qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
-cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
-bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
-lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
-oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index d02ad98d..00000000
--- a/swamid-1.0/ab11.ladok.umu.se-ecs-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://ab11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKMtDIJtZFr9MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYzNloXDTIwMDkxNDE0
-NDYzNlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDCpyOMaQFXaHnFeEtdQFuqVqRxQU2lsU1RJFfS
-x+oYlXJjffMbkd1IzpQAEVQ+aoCAePd/mKDRuojRGesFqZfXjc3F4i1dnqBSSjLA
-mpIbwZ2Dl5rqaaaOFQC2rhHzpT2O4UXmEkqxC4OBlN+2RN/JB/Ldqs1gASY74uEb
-km8Y4xQIEmGIoCPnbtaghjf38NJl0aiIz6xHY0VCbqii3haNjp9PBlFpYZWtjr0h
-Ngr0cW/9ZTpISo8YtAvzHKu7DD5uRQvI67OSod9Tfj9Hf10bfBY6Ngo4rHXgibaJ
-Z9R28iKynEV14vjJlv7HSNq8JcmNnZF7VSe/axUxjvEkQtb7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUygQJMXOd+edUUzmGi9ITq22yFIswDQYJ
-KoZIhvcNAQEFBQADggEBAG8AVb5K537W8X9FaYuGnjF6CMfYq2vU6v9jE0tFqo4J
-qz81KXEeXV+IErIcJBqL0TfleHfG1sHz1cxpHimMOakH0N8qXYbDrTWwbptAVP1A
-Se9vokcbJpPxp5oWDz2tAMJT9X8ICC3/m2X4k2lIkUXTOk3fKsNwSpOHesGBeuXl
-ig7ynWlWk2zh9xxGDSM24YZUFXGRImn/hFAKqwEHjGMwx18K02o3I8ZLKKsPyQVm
-bOR+PNmBCmMKuVF2QQEN38+F0VtU/ekZ7gnVY2Uf/3pNPVVMASg50otkYp0yyULE
-BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
-</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>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKMtDIJtZFr9MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYzNloXDTIwMDkxNDE0
-NDYzNlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDCpyOMaQFXaHnFeEtdQFuqVqRxQU2lsU1RJFfS
-x+oYlXJjffMbkd1IzpQAEVQ+aoCAePd/mKDRuojRGesFqZfXjc3F4i1dnqBSSjLA
-mpIbwZ2Dl5rqaaaOFQC2rhHzpT2O4UXmEkqxC4OBlN+2RN/JB/Ldqs1gASY74uEb
-km8Y4xQIEmGIoCPnbtaghjf38NJl0aiIz6xHY0VCbqii3haNjp9PBlFpYZWtjr0h
-Ngr0cW/9ZTpISo8YtAvzHKu7DD5uRQvI67OSod9Tfj9Hf10bfBY6Ngo4rHXgibaJ
-Z9R28iKynEV14vjJlv7HSNq8JcmNnZF7VSe/axUxjvEkQtb7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUygQJMXOd+edUUzmGi9ITq22yFIswDQYJ
-KoZIhvcNAQEFBQADggEBAG8AVb5K537W8X9FaYuGnjF6CMfYq2vU6v9jE0tFqo4J
-qz81KXEeXV+IErIcJBqL0TfleHfG1sHz1cxpHimMOakH0N8qXYbDrTWwbptAVP1A
-Se9vokcbJpPxp5oWDz2tAMJT9X8ICC3/m2X4k2lIkUXTOk3fKsNwSpOHesGBeuXl
-ig7ynWlWk2zh9xxGDSM24YZUFXGRImn/hFAKqwEHjGMwx18K02o3I8ZLKKsPyQVm
-bOR+PNmBCmMKuVF2QQEN38+F0VtU/ekZ7gnVY2Uf/3pNPVVMASg50otkYp0yyULE
-BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-aws-sp.xml b/swamid-1.0/at11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index c25d80fd..00000000
--- a/swamid-1.0/at11.ladok.umu.se-aws-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://at11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP1hE0EHIKsuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1N1oXDTIwMDkxNDE0
-NDY1N1owHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDGeqaN0xm5tGKhfustShB5dhNalA0Jx/f9VFq3
-3FNiJYPEAAJVf0OF3wZiBUrxOBEMV5PGXrYKGf+xSTc+H0wDTuRawKFODjsz/bZc
-5ndDebnLIX9PUVjF/WF3Yw6kDbZ5JbbPLiF3O5iW8t2AKs0Ndc49kSVz/zRXVCpM
-3EbpwPdo053CkeUCliBvjrBcXSnSdYjCWBFbpMYOPVI8e7+V7uNYrNOji753YIEV
-L0g3jdqCiji0rcyPM2E3/hdf7gBxrlfKCpPQLFLtb9/3oFfdLBrTS2VW8qb/Ci1e
-hEwtGrW51UEDLlpWIrztP04f3jTV2Vm8xVaHKvC5B6aeyVHhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUuiQ/KAggEI27yW++bwnaS+O6BI4wDQYJ
-KoZIhvcNAQEFBQADggEBADSRol2Nrm5TLvSIz+/CuYylk7iQgBMDrZJarIRnJjpk
-woAtaxOiUB5xjWmxdPx+ZHd3dkhDAiHoi6+lJ1rPlXbl4McZcYj5eX6RlnDbReNf
-HFj15o9YnXX77u8wTDbWwiQdi6nXPvXdOm06WqdftI9zGTGfMJt9ii8NYMiXcKMo
-IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
-6u+JDhKqz0EKIXx6UWEzCld9JHIEbx0zf1E9XlRHn3VPdW6wDLc1vSD/6/cyle0k
-/neyaEfxBBMMp9/pi9PY+4ELupANMkXNDG/bbqOSW2M=
-</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>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP1hE0EHIKsuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1N1oXDTIwMDkxNDE0
-NDY1N1owHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDGeqaN0xm5tGKhfustShB5dhNalA0Jx/f9VFq3
-3FNiJYPEAAJVf0OF3wZiBUrxOBEMV5PGXrYKGf+xSTc+H0wDTuRawKFODjsz/bZc
-5ndDebnLIX9PUVjF/WF3Yw6kDbZ5JbbPLiF3O5iW8t2AKs0Ndc49kSVz/zRXVCpM
-3EbpwPdo053CkeUCliBvjrBcXSnSdYjCWBFbpMYOPVI8e7+V7uNYrNOji753YIEV
-L0g3jdqCiji0rcyPM2E3/hdf7gBxrlfKCpPQLFLtb9/3oFfdLBrTS2VW8qb/Ci1e
-hEwtGrW51UEDLlpWIrztP04f3jTV2Vm8xVaHKvC5B6aeyVHhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUuiQ/KAggEI27yW++bwnaS+O6BI4wDQYJ
-KoZIhvcNAQEFBQADggEBADSRol2Nrm5TLvSIz+/CuYylk7iQgBMDrZJarIRnJjpk
-woAtaxOiUB5xjWmxdPx+ZHd3dkhDAiHoi6+lJ1rPlXbl4McZcYj5eX6RlnDbReNf
-HFj15o9YnXX77u8wTDbWwiQdi6nXPvXdOm06WqdftI9zGTGfMJt9ii8NYMiXcKMo
-IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
-6u+JDhKqz0EKIXx6UWEzCld9JHIEbx0zf1E9XlRHn3VPdW6wDLc1vSD/6/cyle0k
-/neyaEfxBBMMp9/pi9PY+4ELupANMkXNDG/bbqOSW2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/at11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index ca3f4a43..00000000
--- a/swamid-1.0/at11.ladok.umu.se-ecs-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://at11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJ39O0nkjAShMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0
-NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCh76LCe/1lh8corKOoSU1ooBLymfKGnksQR0sn
-q61NQl539XmT6RqyE6Bv/lKaWBxo73DUAvSSZk6du7wmM0Rrhq9xUPphd8fm2aHy
-psf/CId4UL/ahQy0koCWKw5IbP1vKyeMKHwcj9pWc+mVnhkWkYb9PtL4KTYC0Hez
-dUKiyQJiFB0QBMO3ED4hq0tE0McC9dx0FM6zJ8A67jjxpevapIukKBIP26/ZtyP5
-kWfeA+ziQpATZEK7rK4ykufqrdxN7VqtBhRb5rOlHJoecLj+pi02PuIuGb2PW1O/
-PqQ1SyO5ZT2ymtVkZBreGAedpk+CKBfF7PSgP00Dj4vebUc5AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUr1nAwUxvgfmegsSTv80sXtYFs5gwDQYJ
-KoZIhvcNAQEFBQADggEBAAgIhwoUpSH6WxMqnAC9JQM4+/NexKMpeWu7gSfppf1t
-cLX6REa6oFn2GNXYvZGX7UMx3yJDqgSUa046GyulZeB0jr2E4ecEPc0MePQJVW6P
-FQ2KNnmWuL0zdljWC9RAwdZt853x3ey6Jy6lV9gmsbu4JfMKkn29/NxWylQjqOg3
-tdV9fuHjjGgWBEoKMZFnWnRCKBj0+84EUfZ/Mko5h4f1JCtYJQ1/xis+QnJd+S3l
-NtXfJmZRkbaYmrLN9uPyYww61OfYNbQ1D20uil8fFqOPops9ueg07uWo4Cfv5MDK
-DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
-</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>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJ39O0nkjAShMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0
-NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCh76LCe/1lh8corKOoSU1ooBLymfKGnksQR0sn
-q61NQl539XmT6RqyE6Bv/lKaWBxo73DUAvSSZk6du7wmM0Rrhq9xUPphd8fm2aHy
-psf/CId4UL/ahQy0koCWKw5IbP1vKyeMKHwcj9pWc+mVnhkWkYb9PtL4KTYC0Hez
-dUKiyQJiFB0QBMO3ED4hq0tE0McC9dx0FM6zJ8A67jjxpevapIukKBIP26/ZtyP5
-kWfeA+ziQpATZEK7rK4ykufqrdxN7VqtBhRb5rOlHJoecLj+pi02PuIuGb2PW1O/
-PqQ1SyO5ZT2ymtVkZBreGAedpk+CKBfF7PSgP00Dj4vebUc5AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUr1nAwUxvgfmegsSTv80sXtYFs5gwDQYJ
-KoZIhvcNAQEFBQADggEBAAgIhwoUpSH6WxMqnAC9JQM4+/NexKMpeWu7gSfppf1t
-cLX6REa6oFn2GNXYvZGX7UMx3yJDqgSUa046GyulZeB0jr2E4ecEPc0MePQJVW6P
-FQ2KNnmWuL0zdljWC9RAwdZt853x3ey6Jy6lV9gmsbu4JfMKkn29/NxWylQjqOg3
-tdV9fuHjjGgWBEoKMZFnWnRCKBj0+84EUfZ/Mko5h4f1JCtYJQ1/xis+QnJd+S3l
-NtXfJmZRkbaYmrLN9uPyYww61OfYNbQ1D20uil8fFqOPops9ueg07uWo4Cfv5MDK
-DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-aws-sp.xml b/swamid-1.0/ft11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 1957324e..00000000
--- a/swamid-1.0/ft11.ladok.umu.se-aws-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://ft11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAONLDIY7xJ0qMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMFoXDTIwMDkxNDE0
-NDcwMFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDmNJ9a41uG70456BPJrqd0hl1MCKZVtSVcQDAx
-5BXucaYNWapH5F9NpNHwWDsIMB8k7ST6Vea1VElbvEYhUxWE1EeLzS4s4bpfpM/9
-ZSuj9ihQCC3ggKJ2KW4021MzgdlgAaPNtPOLFD1WlRwObHANYUqXUSdw0gb2uBHe
-GUQSSGUp14Rh/k8STpb34+pSjaa9uKn0lxzYolNDeoc5YT4oSfF4mSiclHVvhJR3
-O809q2G27CmjkEgR5Xa+23+eH8J0K0bWRtqxiteC+RChY7aF0uXm+WwCnZOnI/Hm
-hdIeJ2Q5z2o7M3jTo0/GVFKmYG5IhKz9My0FBSVlXGh+3fjzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUEN7TqCRS1WbFkVsqxlZWe+5PIzwwDQYJ
-KoZIhvcNAQEFBQADggEBACmZOL3YyS+zfzd9QXBg6jnT9MeW4IxCkM3Rho+m89G5
-o5jgNMmCDIAcIxSjVrN1wEycni1vYla8WhI5t8vMUKtcBd2qciZ7nnWZP5ykeZ7J
-gMIBK9OomzMoQcsooUcztn9bAs27X5BG7CnVdX9zApb9gy2KdpQ0jTGc8x2iikHA
-+eQmxk04sVIe2TKF4ep0x4w4YqvabCb2uJ7t0onxrM/tWQW69J/fkJa6qJLIbD/4
-mjZ5pGVZ3BTafKJGgjN3PJTAffATr8gPDWktLCjOrFCSuHN3JE7/01U1f6fMih1c
-Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
-</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>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAONLDIY7xJ0qMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMFoXDTIwMDkxNDE0
-NDcwMFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDmNJ9a41uG70456BPJrqd0hl1MCKZVtSVcQDAx
-5BXucaYNWapH5F9NpNHwWDsIMB8k7ST6Vea1VElbvEYhUxWE1EeLzS4s4bpfpM/9
-ZSuj9ihQCC3ggKJ2KW4021MzgdlgAaPNtPOLFD1WlRwObHANYUqXUSdw0gb2uBHe
-GUQSSGUp14Rh/k8STpb34+pSjaa9uKn0lxzYolNDeoc5YT4oSfF4mSiclHVvhJR3
-O809q2G27CmjkEgR5Xa+23+eH8J0K0bWRtqxiteC+RChY7aF0uXm+WwCnZOnI/Hm
-hdIeJ2Q5z2o7M3jTo0/GVFKmYG5IhKz9My0FBSVlXGh+3fjzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUEN7TqCRS1WbFkVsqxlZWe+5PIzwwDQYJ
-KoZIhvcNAQEFBQADggEBACmZOL3YyS+zfzd9QXBg6jnT9MeW4IxCkM3Rho+m89G5
-o5jgNMmCDIAcIxSjVrN1wEycni1vYla8WhI5t8vMUKtcBd2qciZ7nnWZP5ykeZ7J
-gMIBK9OomzMoQcsooUcztn9bAs27X5BG7CnVdX9zApb9gy2KdpQ0jTGc8x2iikHA
-+eQmxk04sVIe2TKF4ep0x4w4YqvabCb2uJ7t0onxrM/tWQW69J/fkJa6qJLIbD/4
-mjZ5pGVZ3BTafKJGgjN3PJTAffATr8gPDWktLCjOrFCSuHN3JE7/01U1f6fMih1c
-Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index cf15b9ea..00000000
--- a/swamid-1.0/ft11.ladok.umu.se-ecs-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://ft11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKO4rcJ3zABpMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0
-NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDDK/UXWctJFiMJovcV9vGcoZsbUP35d5aoH3X
-aovqxcVdzl+vtjv7XUPTQP1VjjqB/OiOTJ1MfHPKBsw3ZlTCP2TLQH/RaHMvRs6v
-NikuyKeTAv+9lqpulFwvSW4wn+Z1B5FWiCEejdv26nc5a+0m2hyHkIdouB2oe/pR
-PuhIjOYZ9aDqQTGR8d2hNorKL2vWGRWRsHIIzMvHJR5SQpR/S8w9bJWnP1Cx+7hC
-cMO2SO6h3NEck0akBW8wYIEMulwXUqnE+cIWVWXxVS9UmZQw6w5pRsHB6MKnxY67
-AZKCeBilb1rRbx9h1opBM36TVBJooEuNiUPhxRatpJwTu8MFAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU0XVhglgUeNc60HCGRTnmqUWKiWowDQYJ
-KoZIhvcNAQEFBQADggEBAGTcvssSNqdDxIkR0H1XEecAJuas0zwWNI76wP/PqdG1
-SxhCd/0WiD+aT229a5N7lU8YW1BD3T7ePjTtdGMihEeHRfsxSR+LStY5PUdjys3A
-o0XtlztaGp6wPMSYXcKklEZ7GS6MINcYp0i8+mmsEw/PJGpWkjrNjPscFHN0P7wp
-aLw6EVQYXbySpQ/VWUmI/RjpRIzW0o2oeTnts4W/nV76GHCEoaFA6PbG+Tiy9MHc
-ouNps+VFNT0ORVfslF33KLGLh2ucUrP/OPZzqJbq7roMTYMfgxek8ZwYEXj/iA8O
-pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
-</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>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKO4rcJ3zABpMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0
-NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDDK/UXWctJFiMJovcV9vGcoZsbUP35d5aoH3X
-aovqxcVdzl+vtjv7XUPTQP1VjjqB/OiOTJ1MfHPKBsw3ZlTCP2TLQH/RaHMvRs6v
-NikuyKeTAv+9lqpulFwvSW4wn+Z1B5FWiCEejdv26nc5a+0m2hyHkIdouB2oe/pR
-PuhIjOYZ9aDqQTGR8d2hNorKL2vWGRWRsHIIzMvHJR5SQpR/S8w9bJWnP1Cx+7hC
-cMO2SO6h3NEck0akBW8wYIEMulwXUqnE+cIWVWXxVS9UmZQw6w5pRsHB6MKnxY67
-AZKCeBilb1rRbx9h1opBM36TVBJooEuNiUPhxRatpJwTu8MFAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU0XVhglgUeNc60HCGRTnmqUWKiWowDQYJ
-KoZIhvcNAQEFBQADggEBAGTcvssSNqdDxIkR0H1XEecAJuas0zwWNI76wP/PqdG1
-SxhCd/0WiD+aT229a5N7lU8YW1BD3T7ePjTtdGMihEeHRfsxSR+LStY5PUdjys3A
-o0XtlztaGp6wPMSYXcKklEZ7GS6MINcYp0i8+mmsEw/PJGpWkjrNjPscFHN0P7wp
-aLw6EVQYXbySpQ/VWUmI/RjpRIzW0o2oeTnts4W/nV76GHCEoaFA6PbG+Tiy9MHc
-ouNps+VFNT0ORVfslF33KLGLh2ucUrP/OPZzqJbq7roMTYMfgxek8ZwYEXj/iA8O
-pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-aws-sp.xml b/swamid-1.0/it11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index f1d546a0..00000000
--- a/swamid-1.0/it11.ladok.umu.se-aws-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://it11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://it11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKuqYxyQ4zHlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDKaQVOX/zOAtEAMfDlYyG5vGJHLbJpHfCeBE8w
-saEF9ElgUi6f8gEmMgD2ZRiDR9XxALzIt3GorDkcYIuKJ4gq2/gSoSvPpSZuA5CQ
-LfcLS2kax9Fw9BJyiwhQ7xX5vU8UfoVyjmYhhzs9OefVJJgrjNuuc+hygtSmtH4c
-56BgHPXcecRDTQ0plEW4qB+x/irzBZE0bDCbxufv5W5NV49phnwU5NvSeR1c7Aem
-0KF9nWC4JQMTOrj3YnL/0esxLre5LwDfFIVZmVwC6em7owFeSozLAYiUzQyp1J+l
-kZITLjPAvmOtN4FST7rNP3I1NdyzHmBnKzl0oyNyCUxciHx7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU+g4MKy6dJJ+8jkqt45EByzKyBBcwDQYJ
-KoZIhvcNAQEFBQADggEBAHq/mDMIQhX0NKoS4/Sv4M+XPDDD2aaFaZx+ygOwg4a5
-j+L1tEby4V+ROAez2Pvea4TeyG/xMofhvpzlS5Pp2FJnnvuZxiO4Ty18dB5w8IlH
-aXy0rQ0Y9tCPgvi3ipvvnO74lyxNujHf3U+U0TW0PuxoiQMY1fzxZsttRPH3HXkB
-wu1/Pzvuqt8i4GQgpFop7Te6joIfmapXVs8Oi2NK2dMHo5rKOPbk9+UGfbFpmgpU
-sYGdWKEt9Bj7n9rPO12xPufnxqK2+DRr4DC7/yXsUu2oLLOiNaxwXIsyQmZlP0IC
-FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
-</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://it11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKuqYxyQ4zHlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDKaQVOX/zOAtEAMfDlYyG5vGJHLbJpHfCeBE8w
-saEF9ElgUi6f8gEmMgD2ZRiDR9XxALzIt3GorDkcYIuKJ4gq2/gSoSvPpSZuA5CQ
-LfcLS2kax9Fw9BJyiwhQ7xX5vU8UfoVyjmYhhzs9OefVJJgrjNuuc+hygtSmtH4c
-56BgHPXcecRDTQ0plEW4qB+x/irzBZE0bDCbxufv5W5NV49phnwU5NvSeR1c7Aem
-0KF9nWC4JQMTOrj3YnL/0esxLre5LwDfFIVZmVwC6em7owFeSozLAYiUzQyp1J+l
-kZITLjPAvmOtN4FST7rNP3I1NdyzHmBnKzl0oyNyCUxciHx7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU+g4MKy6dJJ+8jkqt45EByzKyBBcwDQYJ
-KoZIhvcNAQEFBQADggEBAHq/mDMIQhX0NKoS4/Sv4M+XPDDD2aaFaZx+ygOwg4a5
-j+L1tEby4V+ROAez2Pvea4TeyG/xMofhvpzlS5Pp2FJnnvuZxiO4Ty18dB5w8IlH
-aXy0rQ0Y9tCPgvi3ipvvnO74lyxNujHf3U+U0TW0PuxoiQMY1fzxZsttRPH3HXkB
-wu1/Pzvuqt8i4GQgpFop7Te6joIfmapXVs8Oi2NK2dMHo5rKOPbk9+UGfbFpmgpU
-sYGdWKEt9Bj7n9rPO12xPufnxqK2+DRr4DC7/yXsUu2oLLOiNaxwXIsyQmZlP0IC
-FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/it11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 68922e62..00000000
--- a/swamid-1.0/it11.ladok.umu.se-ecs-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://it11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://it11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJANVNcct/lAgHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDeC/ZeytAUYweQ+TiZnOzAhOQzsXvIpTBROk1z
-QYEejwD15UCDnK2TgnPSBMIFsWLzMs4svoVC13Dszrxkeaundc9WD1gdbkZ1F218
-UiLYAW4EQLL0CZ9xbzymSLJChYpwPW5pz4Q0jP1iwlZsmg8X4dwaJ37tD8X7ZT46
-hBpe6LzDvwGJrJYpAtQXSPH1KN+X5swIZIyDSLwSwK7sXyPoyjRaTjE/NJq8PTm0
-pqARgGZ2YAHz59lvnCvCx2u97MgrHG0jDLl4Q+E+N4dDYdmFvHAijgTAZsS8C/S/
-WfKcKszGiV5t51ou1w0TSwbibUJ+2kwo8Jfa0mv7MNhBGRmPAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUT+tR392AFCLM9g0r73l7MF/mvr0wDQYJ
-KoZIhvcNAQEFBQADggEBACh5/529PBBzqJE3IA1XJibr+FnUkHYm7tEUs6WSH1PK
-qcsV7OFm/yGp+RiJPNXjFF3W1fj0G4MzTCHlFxT1+EZtuEM+b20IiQDzI2iEnCdc
-xn3vOx10+4TYU81a3iD+YJOH0SYuyWX3EpyHRptwUk1eZrUJYHuWphvVZHJNfI80
-IWaX1D8a3eyQIczTz3XiDFezGoHBJLUV77oc/fphAjQjGkQubsoMchtg4mO9Vaww
-DorX9Z7NMhBecPZnP8IWkyWsqdHJ7CupHj9JH/H9tZzFWxdZ1hlPzAMldalfbQOm
-covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
-</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://it11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJANVNcct/lAgHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDeC/ZeytAUYweQ+TiZnOzAhOQzsXvIpTBROk1z
-QYEejwD15UCDnK2TgnPSBMIFsWLzMs4svoVC13Dszrxkeaundc9WD1gdbkZ1F218
-UiLYAW4EQLL0CZ9xbzymSLJChYpwPW5pz4Q0jP1iwlZsmg8X4dwaJ37tD8X7ZT46
-hBpe6LzDvwGJrJYpAtQXSPH1KN+X5swIZIyDSLwSwK7sXyPoyjRaTjE/NJq8PTm0
-pqARgGZ2YAHz59lvnCvCx2u97MgrHG0jDLl4Q+E+N4dDYdmFvHAijgTAZsS8C/S/
-WfKcKszGiV5t51ou1w0TSwbibUJ+2kwo8Jfa0mv7MNhBGRmPAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUT+tR392AFCLM9g0r73l7MF/mvr0wDQYJ
-KoZIhvcNAQEFBQADggEBACh5/529PBBzqJE3IA1XJibr+FnUkHYm7tEUs6WSH1PK
-qcsV7OFm/yGp+RiJPNXjFF3W1fj0G4MzTCHlFxT1+EZtuEM+b20IiQDzI2iEnCdc
-xn3vOx10+4TYU81a3iD+YJOH0SYuyWX3EpyHRptwUk1eZrUJYHuWphvVZHJNfI80
-IWaX1D8a3eyQIczTz3XiDFezGoHBJLUV77oc/fphAjQjGkQubsoMchtg4mO9Vaww
-DorX9Z7NMhBecPZnP8IWkyWsqdHJ7CupHj9JH/H9tZzFWxdZ1hlPzAMldalfbQOm
-covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-aws-sp.xml b/swamid-1.0/nb11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index f1a87976..00000000
--- a/swamid-1.0/nb11.ladok.umu.se-aws-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://nb11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP5V3e0CgGVCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMVoXDTIwMDkxNDE0
-NDcxMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDMjJnqbMwTcx+C5GfIokD01gccn0e7pTM3G3/y
-25QX9ytysMRnVlkwjU5aB7vnsN7LTpYS3rL7wCicjM+0IfKnYrj3wDpwnZ2L+6e8
-MCO48Fu4jBRv238hERLUWMEQ3u4bFId4A4SyBr8iUPDZ8ckFlapsm3SWlYHRnDAy
-8k69rykcfYrKB+T/yhhUlsRClB/EPTPsQMrRzd0kYQMO4+PsC9NZnJtSEo4cy/Y5
-T1Ys1dMqjzRQZvZPLCo03RQiFgnNhKnGY1bzh8+Sq7IkjPT5sGRcuOQTEjpXjV4/
-vC+JId7r47mwn8Wwt4x80Q5esDnhs5DTSgcDuXUt+QU77ftxAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUeKh+94BbFChCTgBUROLwBmbRQUMwDQYJ
-KoZIhvcNAQEFBQADggEBADGsIqiMYbVqvNI0oPw7JtTGhFEk2yUT1vQoTdnWjFkO
-iUmrCKQGypnzo7+1pG3FfpHOzdjqLUoutyGoqVkfzrkWqG7hwRkz0Rfp3WXS4EUk
-Goq4KuCAqgNQ8KtTyjmvZRLlp3NDARdteejMS57TcSz6Ri061L8EpMQtPqz7DJvD
-zRXz63nQAvC8QIDFQZ2rs2kMluzSdlbLVlFqpZnzqvXiJQOGxnoinjljFJsrMRYR
-kvjS6Cr4xojKjIhDb8ksQIRZVek5rFKJChkQmXaOc5ClV0Y7N9f3I7+ZjdZ5g4dj
-Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
-</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://nb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP5V3e0CgGVCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMVoXDTIwMDkxNDE0
-NDcxMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDMjJnqbMwTcx+C5GfIokD01gccn0e7pTM3G3/y
-25QX9ytysMRnVlkwjU5aB7vnsN7LTpYS3rL7wCicjM+0IfKnYrj3wDpwnZ2L+6e8
-MCO48Fu4jBRv238hERLUWMEQ3u4bFId4A4SyBr8iUPDZ8ckFlapsm3SWlYHRnDAy
-8k69rykcfYrKB+T/yhhUlsRClB/EPTPsQMrRzd0kYQMO4+PsC9NZnJtSEo4cy/Y5
-T1Ys1dMqjzRQZvZPLCo03RQiFgnNhKnGY1bzh8+Sq7IkjPT5sGRcuOQTEjpXjV4/
-vC+JId7r47mwn8Wwt4x80Q5esDnhs5DTSgcDuXUt+QU77ftxAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUeKh+94BbFChCTgBUROLwBmbRQUMwDQYJ
-KoZIhvcNAQEFBQADggEBADGsIqiMYbVqvNI0oPw7JtTGhFEk2yUT1vQoTdnWjFkO
-iUmrCKQGypnzo7+1pG3FfpHOzdjqLUoutyGoqVkfzrkWqG7hwRkz0Rfp3WXS4EUk
-Goq4KuCAqgNQ8KtTyjmvZRLlp3NDARdteejMS57TcSz6Ri061L8EpMQtPqz7DJvD
-zRXz63nQAvC8QIDFQZ2rs2kMluzSdlbLVlFqpZnzqvXiJQOGxnoinjljFJsrMRYR
-kvjS6Cr4xojKjIhDb8ksQIRZVek5rFKJChkQmXaOc5ClV0Y7N9f3I7+ZjdZ5g4dj
-Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index acbb6de2..00000000
--- a/swamid-1.0/nb11.ladok.umu.se-ecs-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://nb11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
-NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
-YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
-whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
-Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
-/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
-lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
-KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
-4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
-42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
-uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
-SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
-CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
-</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://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
-NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
-YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
-whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
-Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
-/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
-lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
-KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
-4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
-42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
-uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
-SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
-CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index fc5dc478..00000000
--- a/swamid-1.0/nya-00.ladok.umu.se-aws-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://nya-00.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-00.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKtkD897x9WcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDY1NDMzWhcNMjAwODE3
-MDY1NDMzWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6KXK3h93ozXRe6ibnLh8cAAEH1sw9Tk
-A9ovvtt5xfd7KZ06RTQV3ipV6LIYcuev7OdbsaWL/ngDIpANwxcRUVHYK7u6LPz8
-vSRZfOOkEFcD0A909MgVzzrZUd9ZRmaaNuRlocamUr4Wlje5My6wxE+1wrwnSMJ4
-Q0+mdK/lUk250Fi+/bI93nZXA1WiToS9rvuAIBvK4jGDVEU7/6IRaZWziObBHiav
-JxpyLwPse2LJ4Q/e4/8so8w0PHv4mqwWsUwYWIH6lRIILej2xVvMtDYcxidnaa+O
-DkeOAZgshq4LMoXk6t59oAkKkNRUJ+bLPB5E3XQ7COkYK49HaQ0+zwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRS34NX+9BCRC9L4elZL6y9
-hmVYhDANBgkqhkiG9w0BAQUFAAOCAQEAGIPcySc/4YXTQoZ9xC3hRSP7Qjsxl/jV
-Icww+6vMxqunXjRzKv5eym3ih9D52nNuWJOV1QusYmqYrrGFE4JEtke4vY/tvVX8
-eFMIhz1vt0/R/p43a1V68xLFhnf6O60/D7QOa4HU7LfSNTjCOwFUJKOYFZhoyNo0
-+DbuhVFq8Ae9LzphXE+FWw4D5eXTUxl5gKCupdr5loPVruLVa1g7bxEmLppr3SBW
-1MttzgyPw0EYgC5tLw5IzYz9o3s5tm5/3dUqMHfovBQ0U/GEYBxiNq8Pq+UBvpB6
-EQCi6eLTHNmRPDAUY7W6LPbhNtXs1ieRJ8tKFug4pEjGAq7FDPCIQA==
-</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://nya-00.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKtkD897x9WcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDY1NDMzWhcNMjAwODE3
-MDY1NDMzWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6KXK3h93ozXRe6ibnLh8cAAEH1sw9Tk
-A9ovvtt5xfd7KZ06RTQV3ipV6LIYcuev7OdbsaWL/ngDIpANwxcRUVHYK7u6LPz8
-vSRZfOOkEFcD0A909MgVzzrZUd9ZRmaaNuRlocamUr4Wlje5My6wxE+1wrwnSMJ4
-Q0+mdK/lUk250Fi+/bI93nZXA1WiToS9rvuAIBvK4jGDVEU7/6IRaZWziObBHiav
-JxpyLwPse2LJ4Q/e4/8so8w0PHv4mqwWsUwYWIH6lRIILej2xVvMtDYcxidnaa+O
-DkeOAZgshq4LMoXk6t59oAkKkNRUJ+bLPB5E3XQ7COkYK49HaQ0+zwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRS34NX+9BCRC9L4elZL6y9
-hmVYhDANBgkqhkiG9w0BAQUFAAOCAQEAGIPcySc/4YXTQoZ9xC3hRSP7Qjsxl/jV
-Icww+6vMxqunXjRzKv5eym3ih9D52nNuWJOV1QusYmqYrrGFE4JEtke4vY/tvVX8
-eFMIhz1vt0/R/p43a1V68xLFhnf6O60/D7QOa4HU7LfSNTjCOwFUJKOYFZhoyNo0
-+DbuhVFq8Ae9LzphXE+FWw4D5eXTUxl5gKCupdr5loPVruLVa1g7bxEmLppr3SBW
-1MttzgyPw0EYgC5tLw5IzYz9o3s5tm5/3dUqMHfovBQ0U/GEYBxiNq8Pq+UBvpB6
-EQCi6eLTHNmRPDAUY7W6LPbhNtXs1ieRJ8tKFug4pEjGAq7FDPCIQA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 2b701611..00000000
--- a/swamid-1.0/nya-00.ladok.umu.se-ecs-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://nya-00.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-00.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPnkgyiVy3SGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDcwODU5WhcNMjAwODE3
-MDcwODU5WjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuOTz2HgGQOUBfOqpb5FCef6/OTKD/qjX
-r86Ol36BIVB1UPLpX80jLXwX6BfXA7jFcrsuSHK/wIqvALfprP8GuEdfg4yCLxgV
-deODB+xBGMtokmzHOhbzOj2Gp9L64a1Y8M5kcpQrf1WWrNPmGH7/NIbXa7LL69vd
-GFp+fLDM15C1xryzgve686mICmxSEJbyGe6+TTxQNorTNtZ5yQGp0sgduu8diYMW
-wDe29AJzIVPnjkRjPRxitPKwxWQJPT3fbhb2Fz/V9HsddE585ydOTYjJwkMmDNgg
-fOXwPNVxRVBeJGNGf83BtanPCf5SoY2wchabMAVRcL3kLoPDlG0kGQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRbGyy2KE2LI+t+yYYmfKwT
-penTYDANBgkqhkiG9w0BAQUFAAOCAQEAHw8OjcuBB3EIlVXsVAwM+hhqISLh8LvT
-ZsGbBCWPPo5NOvle/Aa+4oVV1Gib/F+1wtJHUTwCTp+dNQadPCnzj2jcLt52x8Mr
-2aT/GHtEjHU55nIqMYyb++d9cuzDjXJdPwY7VGUrvlnSxN0VYmrG8cYZIlnaqQa9
-cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
-6qskzr18Hf3VIB1FWNi91DRxZJski2UpjveU+X5i5kSw11i3Bqhu5N04XC5SvLGp
-5lJ1W7OUkZNaCB0XnvZ6BwbvEsZ/o0Axv5ZDeoAbQjVmolThH6vzdA==
-</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://nya-00.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPnkgyiVy3SGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDcwODU5WhcNMjAwODE3
-MDcwODU5WjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuOTz2HgGQOUBfOqpb5FCef6/OTKD/qjX
-r86Ol36BIVB1UPLpX80jLXwX6BfXA7jFcrsuSHK/wIqvALfprP8GuEdfg4yCLxgV
-deODB+xBGMtokmzHOhbzOj2Gp9L64a1Y8M5kcpQrf1WWrNPmGH7/NIbXa7LL69vd
-GFp+fLDM15C1xryzgve686mICmxSEJbyGe6+TTxQNorTNtZ5yQGp0sgduu8diYMW
-wDe29AJzIVPnjkRjPRxitPKwxWQJPT3fbhb2Fz/V9HsddE585ydOTYjJwkMmDNgg
-fOXwPNVxRVBeJGNGf83BtanPCf5SoY2wchabMAVRcL3kLoPDlG0kGQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRbGyy2KE2LI+t+yYYmfKwT
-penTYDANBgkqhkiG9w0BAQUFAAOCAQEAHw8OjcuBB3EIlVXsVAwM+hhqISLh8LvT
-ZsGbBCWPPo5NOvle/Aa+4oVV1Gib/F+1wtJHUTwCTp+dNQadPCnzj2jcLt52x8Mr
-2aT/GHtEjHU55nIqMYyb++d9cuzDjXJdPwY7VGUrvlnSxN0VYmrG8cYZIlnaqQa9
-cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
-6qskzr18Hf3VIB1FWNi91DRxZJski2UpjveU+X5i5kSw11i3Bqhu5N04XC5SvLGp
-5lJ1W7OUkZNaCB0XnvZ6BwbvEsZ/o0Axv5ZDeoAbQjVmolThH6vzdA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4a284184..00000000
--- a/swamid-1.0/nya-01.ladok.umu.se-aws-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://nya-01.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
-MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
-1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
-Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
-DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
-Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
-uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
-O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
-SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
-l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
-Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
-LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
-ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/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:KeyName>https://nya-01.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
-MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
-1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
-Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
-DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
-Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
-uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
-O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
-SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
-l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
-Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
-LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
-ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index cc4fba97..00000000
--- a/swamid-1.0/nya-01.ladok.umu.se-ecs-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://nya-01.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-01.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMffz/0eEqtyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0
-MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKXqK5zu7Ksbd8NjQ19iDeLjvc0bMC1t
-zWTGm5HGZ3ItTLbFpBTq1IPdC4PBvcBe90e45UJPBNjs3LOwVpA69WYcOYG945k8
-fMxp2G2v3eW3wlfV3SarXhUJdQ/Dl8G9HQ7mzErYquGYT+N+lyMVMxPUhF2QKZhp
-xuLGnxTJZ4VRwsuNHz/wgLt+akSkKtUhYsoA8TuB29dWOGPyufYEEEJjDYU1n4XB
-3+wDAZbSYNBmbx4xB+n7WhGqezbc1zeGcTTjvgYVNnhzjWJZDXyd04fwoKWfdmFJ
-AlPHAKpkDrF3dsR69rXFuz3vuAPexxKR4oN3t/KAHlLaXstjBCymQQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQhXbsn941U+ujVF8HYBuIl
-I8bLmzANBgkqhkiG9w0BAQUFAAOCAQEAAUNj/MZSJ7Pl3V/wZP9mIcsVmYthr7CA
-gvJW/Zlxb8wJ+bnKUzBK3M5hLW8kBqYvLQVUmulKKILvAwQv7+hbFUhN1MQ7Cszt
-45vQLgAtAA3qloE1ooF39ZnJ+/KP4XYXkyXPUxfVo3bFBlVvjTiyzU7ztv5+pmUL
-HYNklLq2eVXHz0Y0K5O8+hxKif/djSlfqIxRUDBApyMDNAfWQ/wM46HymJ2lvy86
-AI+FDbWK2JMyabvHDCle9P/z0aY1g4u1xlq3Bej7OUXFuRQl6cAxvU8AvPJ7VLE0
-qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
-</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://nya-01.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMffz/0eEqtyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0
-MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKXqK5zu7Ksbd8NjQ19iDeLjvc0bMC1t
-zWTGm5HGZ3ItTLbFpBTq1IPdC4PBvcBe90e45UJPBNjs3LOwVpA69WYcOYG945k8
-fMxp2G2v3eW3wlfV3SarXhUJdQ/Dl8G9HQ7mzErYquGYT+N+lyMVMxPUhF2QKZhp
-xuLGnxTJZ4VRwsuNHz/wgLt+akSkKtUhYsoA8TuB29dWOGPyufYEEEJjDYU1n4XB
-3+wDAZbSYNBmbx4xB+n7WhGqezbc1zeGcTTjvgYVNnhzjWJZDXyd04fwoKWfdmFJ
-AlPHAKpkDrF3dsR69rXFuz3vuAPexxKR4oN3t/KAHlLaXstjBCymQQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQhXbsn941U+ujVF8HYBuIl
-I8bLmzANBgkqhkiG9w0BAQUFAAOCAQEAAUNj/MZSJ7Pl3V/wZP9mIcsVmYthr7CA
-gvJW/Zlxb8wJ+bnKUzBK3M5hLW8kBqYvLQVUmulKKILvAwQv7+hbFUhN1MQ7Cszt
-45vQLgAtAA3qloE1ooF39ZnJ+/KP4XYXkyXPUxfVo3bFBlVvjTiyzU7ztv5+pmUL
-HYNklLq2eVXHz0Y0K5O8+hxKif/djSlfqIxRUDBApyMDNAfWQ/wM46HymJ2lvy86
-AI+FDbWK2JMyabvHDCle9P/z0aY1g4u1xlq3Bej7OUXFuRQl6cAxvU8AvPJ7VLE0
-qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 2aed647e..00000000
--- a/swamid-1.0/nya-02.ladok.umu.se-aws-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://nya-02.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-02.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN7BNw3tiCo+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE4WhcNMjAwOTE0
-MTQ0NzE4WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QlMp1taZN515+zgP1/I6XB7T8Toy9hN
-aMla/6da9v9CrvyoRsS4sVUJJWukOYuDmjuu0/VeTky4xokbdGvppnJQ3qCESXYa
-tAaRJ7JwGCgYXSKwz47V334pLhccC1vuc1lKQK/l/mb61pP6mMigGQzsvqZ8clOK
-9mlzKYb9z3OSVoiEVxmufiQzr/voCA7hbxzVteTVRpXa8EhsT3MqbFALdK28yRAW
-wbMJ7wDcGpe/ZllcdluaCuy6Oivu+pqoc/UXg2n4NLb5BDGQ5NPL8sG+QLf3BY7y
-37VCVNtevGku3qxt22Nf4/MhBCKOpAHgSqrcd4g7JmcDHyHJlLwD6QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSahQyE6hlnBumO2v/3LeRD
-tRP0tjANBgkqhkiG9w0BAQUFAAOCAQEAot7Hnv+FPLq3RazG6NIsuJLWVY4HHzCl
-bxsUCeYeOtRcLUT0uRNVjblOoWbuJMhdS5z/JShm2EY1C2SgaCSPgUoGSL+aN30E
-74B6sBM9XqFnYQePV4++ZQOHgltT6eO2xsrDnX2uWh4IzT1p2/VK61eCABDMSytr
-XG057zY+BKFAYPp5EYOKN87NidYl+8cqskX55ZP6hDkDNsn5uzTpunCDJDWGVcBf
-XrQkZ6UTzns3wN056dfJ6Cp7HLa0scF22OBGun3AOETiszaMJNnZ9q8fDZ0MXCQf
-gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
-</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://nya-02.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN7BNw3tiCo+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE4WhcNMjAwOTE0
-MTQ0NzE4WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QlMp1taZN515+zgP1/I6XB7T8Toy9hN
-aMla/6da9v9CrvyoRsS4sVUJJWukOYuDmjuu0/VeTky4xokbdGvppnJQ3qCESXYa
-tAaRJ7JwGCgYXSKwz47V334pLhccC1vuc1lKQK/l/mb61pP6mMigGQzsvqZ8clOK
-9mlzKYb9z3OSVoiEVxmufiQzr/voCA7hbxzVteTVRpXa8EhsT3MqbFALdK28yRAW
-wbMJ7wDcGpe/ZllcdluaCuy6Oivu+pqoc/UXg2n4NLb5BDGQ5NPL8sG+QLf3BY7y
-37VCVNtevGku3qxt22Nf4/MhBCKOpAHgSqrcd4g7JmcDHyHJlLwD6QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSahQyE6hlnBumO2v/3LeRD
-tRP0tjANBgkqhkiG9w0BAQUFAAOCAQEAot7Hnv+FPLq3RazG6NIsuJLWVY4HHzCl
-bxsUCeYeOtRcLUT0uRNVjblOoWbuJMhdS5z/JShm2EY1C2SgaCSPgUoGSL+aN30E
-74B6sBM9XqFnYQePV4++ZQOHgltT6eO2xsrDnX2uWh4IzT1p2/VK61eCABDMSytr
-XG057zY+BKFAYPp5EYOKN87NidYl+8cqskX55ZP6hDkDNsn5uzTpunCDJDWGVcBf
-XrQkZ6UTzns3wN056dfJ6Cp7HLa0scF22OBGun3AOETiszaMJNnZ9q8fDZ0MXCQf
-gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 90443ec0..00000000
--- a/swamid-1.0/nya-02.ladok.umu.se-ecs-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://nya-02.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-02.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
-MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
-yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
-+YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
-eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
-wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
-NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
-KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
-31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
-xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
-QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
-fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
-lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
-</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://nya-02.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
-MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
-yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
-+YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
-eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
-wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
-NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
-KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
-31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
-xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
-QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
-fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
-lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 44578932..00000000
--- a/swamid-1.0/nya-03.ladok.umu.se-aws-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://nya-03.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-03.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO4S8REyHyj6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0
-MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA50vdahPq/rlI+9MIEgQNOfpn2n7WWt6s
-ZnIjGU0mDkLybFnFgBDrqKnwcFjNiIv6oNblbDTSVOrlT3uI9QgB/+gEt+/1k9ZA
-h9v3QS7PJDABX/2KJvYIZC+ECiCBW3G0Z3eb/EGurRuhiQOw3icQX34SwaCcAQII
-2EBCilEe6UMYLHNE+KmyzEZ0RtS6ZXpzceF6Nsw4bDVa7SM4Wxr5LqaEk/ddqW+T
-Gj4bdyN/EsQCs1EyNVEarDqPqU/Z8pmNff1huOBOSYGqHXaHF4ND2oORfoN/k0ZJ
-NCZgc9G2vKqqyKyLM3jlz2u6jUUHn57ysJ0ZvPT8efhtws1hwPLBFwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQMZlnHTtYu0s+k4n1xRN6R
-T/D9TTANBgkqhkiG9w0BAQUFAAOCAQEAGX9PiAf9YmSyl030FFBGOafEFtBGsrDj
-OKIU430pNF+1nPBPpG1T3bWDqlbJ2OkgXj5Xc5jmUeL/SLqjQGOpznvhgp5AXxiK
-0ZQQE+Y3n3N9cQxDDvHABj80fpebsSj/QGM4coCBCT4bLcDhcDlAgdx7t9bSl9Bl
-2eKofO5SdcXUynpHMZCirmmty5rHp1KG8bHJFEfefg1v8vlpBK0+mCbeyojPQ6Vx
-IVcTUg48nFg+NAnWLNVjRyopVXtzr2alMFNifC/FnbL/beYpKhzWraxoLacFRaqY
-VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
-</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://nya-03.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO4S8REyHyj6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0
-MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA50vdahPq/rlI+9MIEgQNOfpn2n7WWt6s
-ZnIjGU0mDkLybFnFgBDrqKnwcFjNiIv6oNblbDTSVOrlT3uI9QgB/+gEt+/1k9ZA
-h9v3QS7PJDABX/2KJvYIZC+ECiCBW3G0Z3eb/EGurRuhiQOw3icQX34SwaCcAQII
-2EBCilEe6UMYLHNE+KmyzEZ0RtS6ZXpzceF6Nsw4bDVa7SM4Wxr5LqaEk/ddqW+T
-Gj4bdyN/EsQCs1EyNVEarDqPqU/Z8pmNff1huOBOSYGqHXaHF4ND2oORfoN/k0ZJ
-NCZgc9G2vKqqyKyLM3jlz2u6jUUHn57ysJ0ZvPT8efhtws1hwPLBFwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQMZlnHTtYu0s+k4n1xRN6R
-T/D9TTANBgkqhkiG9w0BAQUFAAOCAQEAGX9PiAf9YmSyl030FFBGOafEFtBGsrDj
-OKIU430pNF+1nPBPpG1T3bWDqlbJ2OkgXj5Xc5jmUeL/SLqjQGOpznvhgp5AXxiK
-0ZQQE+Y3n3N9cQxDDvHABj80fpebsSj/QGM4coCBCT4bLcDhcDlAgdx7t9bSl9Bl
-2eKofO5SdcXUynpHMZCirmmty5rHp1KG8bHJFEfefg1v8vlpBK0+mCbeyojPQ6Vx
-IVcTUg48nFg+NAnWLNVjRyopVXtzr2alMFNifC/FnbL/beYpKhzWraxoLacFRaqY
-VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index e40a6b86..00000000
--- a/swamid-1.0/nya-03.ladok.umu.se-ecs-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://nya-03.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-03.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALK7u4Fz/80MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTIwMDcyNDM0WhcNMjAwNTE3
-MDcyNDM0WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA05Rt5nZbYGkPTb5bGXNj0/U6BmjziVoP
-sNuoB/XDOz5xK6gTu4RHcfjXMPI1mnC4u1h2yAr9tCVhXs2inBo3rJ+y8/ElwIF1
-mue6aIkggPkmtHv6WHzgzkUvqe4id82sokpuG/bBmN2C0OF4sghI/jEYT6A7HkkO
-4F2LiXvwFOHGbUiZSPhlylE8qaooOaAXI+GK6YgXBAsNp6nXPmjHgVqaYNvLxV10
-owAXVaCrKCSeM00kkpWtlwlxkSOBqDUBBucyPhqN3IBhv9JAdCJ/DB58PFYJ2Xqo
-mh6LzzFSpznQYWp/q1fvWDgkXnXKZ3vjWTS5GSglSZDOSaQl80ir+QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR2l5jsL4fbPNHBeJLEhJ8S
-eAUpHTANBgkqhkiG9w0BAQUFAAOCAQEAtfR4vZI1bbKzNrm8TwPwkVcHYOpVMoIA
-O9Zx2nj+vSZG/YuIa66TN54021JaPABbdoMcJTd9j+xFhEZTCVWr7UrhLwk+e9dO
-9MQKifI3clrlg8QPEqHqTao+EbzA4qS3V66McFN0sBIbDBw1ytm3phLXuvNKoQBT
-9NbMBZFEgWPT6Z4dCBx9BjCnLQEgwdqwd60g8z6ksvHUF2Kk8BdiNyoAcqbpb7tF
-83xkbNErea0Bu50mYdewcpxxaVEyfWnC5ZE2o/W09zznziFJ5XRj92fgomfFVysc
-u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
-</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://nya-03.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALK7u4Fz/80MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTIwMDcyNDM0WhcNMjAwNTE3
-MDcyNDM0WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA05Rt5nZbYGkPTb5bGXNj0/U6BmjziVoP
-sNuoB/XDOz5xK6gTu4RHcfjXMPI1mnC4u1h2yAr9tCVhXs2inBo3rJ+y8/ElwIF1
-mue6aIkggPkmtHv6WHzgzkUvqe4id82sokpuG/bBmN2C0OF4sghI/jEYT6A7HkkO
-4F2LiXvwFOHGbUiZSPhlylE8qaooOaAXI+GK6YgXBAsNp6nXPmjHgVqaYNvLxV10
-owAXVaCrKCSeM00kkpWtlwlxkSOBqDUBBucyPhqN3IBhv9JAdCJ/DB58PFYJ2Xqo
-mh6LzzFSpznQYWp/q1fvWDgkXnXKZ3vjWTS5GSglSZDOSaQl80ir+QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR2l5jsL4fbPNHBeJLEhJ8S
-eAUpHTANBgkqhkiG9w0BAQUFAAOCAQEAtfR4vZI1bbKzNrm8TwPwkVcHYOpVMoIA
-O9Zx2nj+vSZG/YuIa66TN54021JaPABbdoMcJTd9j+xFhEZTCVWr7UrhLwk+e9dO
-9MQKifI3clrlg8QPEqHqTao+EbzA4qS3V66McFN0sBIbDBw1ytm3phLXuvNKoQBT
-9NbMBZFEgWPT6Z4dCBx9BjCnLQEgwdqwd60g8z6ksvHUF2Kk8BdiNyoAcqbpb7tF
-83xkbNErea0Bu50mYdewcpxxaVEyfWnC5ZE2o/W09zznziFJ5XRj92fgomfFVysc
-u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index aaa93700..00000000
--- a/swamid-1.0/nya-04.ladok.umu.se-aws-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://nya-04.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-04.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM9R6dfKEI8fMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIzWhcNMjAwOTE0
-MTQ0NzIzWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzOsnWCC9QPB6NqxFVXVVZ02wyZs126v
-LmDC5x9cjHKIRrLuqplfA0VAiDCctYGYByu76qSCozW0UDpTQyT72g+upLBs1t6q
-jAuEPyEZHmQlT2PbDLAncVcyXyye2VDOC5MH9x2DM2qbfkCbl9mYiV7KlJxYM4+5
-AHhDqC0gmQwEPPXm3p8/6QfhjpOo3t8DOOIfGg2uWyNYvq1LO+ESm+pqmIMnuJi7
-hwqnFZTG3rVeDc3vViu4qgu6JoCSJ1M8hvwSXrTDoOWVJ8WZ0mjP1yGrCyPqbuDF
-UvUGRfOCYxuk9cJxjymAgTqXEj50cuvbwQDr1EcIzMeBO5TnWfSFIQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPLdzH3b575pAhUQ8nRXPe
-NchkGDANBgkqhkiG9w0BAQUFAAOCAQEAPHndzXTA2q7jDWp8J6oZwmxhkgrrZ5jj
-Tdqb9qVDS8xo4G3/WwovHvkmaTJyZ+6DAY/1Iy/ac8yii213/Ys1pPPICs5crrl/
-aSbqE/XChUbBtKqw2cCoF8uO4DCF56DMyJovKR4Fv+6Kz5tTbg7qKkKoiKDVL9oz
-mGubID6o3Q2kAIS3QRvABPUNin1QQv8LZm9pYv1ZCY68+wIX20sjvPlEXbRAfNVz
-ZbC+BKgbWTrpFNO2QGEL8ANtLJbHBf6eU3LqHldSQgRcogD291DiE3QbMn21vdsp
-nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
-</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://nya-04.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM9R6dfKEI8fMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIzWhcNMjAwOTE0
-MTQ0NzIzWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzOsnWCC9QPB6NqxFVXVVZ02wyZs126v
-LmDC5x9cjHKIRrLuqplfA0VAiDCctYGYByu76qSCozW0UDpTQyT72g+upLBs1t6q
-jAuEPyEZHmQlT2PbDLAncVcyXyye2VDOC5MH9x2DM2qbfkCbl9mYiV7KlJxYM4+5
-AHhDqC0gmQwEPPXm3p8/6QfhjpOo3t8DOOIfGg2uWyNYvq1LO+ESm+pqmIMnuJi7
-hwqnFZTG3rVeDc3vViu4qgu6JoCSJ1M8hvwSXrTDoOWVJ8WZ0mjP1yGrCyPqbuDF
-UvUGRfOCYxuk9cJxjymAgTqXEj50cuvbwQDr1EcIzMeBO5TnWfSFIQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPLdzH3b575pAhUQ8nRXPe
-NchkGDANBgkqhkiG9w0BAQUFAAOCAQEAPHndzXTA2q7jDWp8J6oZwmxhkgrrZ5jj
-Tdqb9qVDS8xo4G3/WwovHvkmaTJyZ+6DAY/1Iy/ac8yii213/Ys1pPPICs5crrl/
-aSbqE/XChUbBtKqw2cCoF8uO4DCF56DMyJovKR4Fv+6Kz5tTbg7qKkKoiKDVL9oz
-mGubID6o3Q2kAIS3QRvABPUNin1QQv8LZm9pYv1ZCY68+wIX20sjvPlEXbRAfNVz
-ZbC+BKgbWTrpFNO2QGEL8ANtLJbHBf6eU3LqHldSQgRcogD291DiE3QbMn21vdsp
-nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 962ba540..00000000
--- a/swamid-1.0/nya-04.ladok.umu.se-ecs-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://nya-04.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-04.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
-MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
-QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
-HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
-fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
-RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
-2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
-HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
-rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
-QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
-zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
-OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
-IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
-</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://nya-04.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
-MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
-QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
-HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
-fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
-RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
-2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
-HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
-rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
-QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
-zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
-OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
-IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index f6c095af..00000000
--- a/swamid-1.0/nya-05.ladok.umu.se-aws-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://nya-05.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-05.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIReNeBJNo61MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI2WhcNMjAwOTE0
-MTQ0NzI2WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3lPw44dhmSAYWtNxxtwuMhhsz2/C+hda
-NoGunH6sV737/wX9533Ym66ID8zxT16WNsQL8K7WTHKCth29MddlgbKwCnnCUMsP
-PPNnW5DG57t0zSL7Szgsz/Ay5HNxv57mEAb5//ZLV+xkLRXgAIizdql5nLUO3uUe
-QrGVd8xN6DCPEwcKkUAwGnFPK/aaEiIqlebj48WW/lAzyQf24MwHpP+zakjXmlN+
-wgh9GS7aSN2G9DqSbUR19qV3rcYZRpHRsXoiYbqhX4TU5rSZY0GknaJFUzZsYYTq
-uLAT+zKjg99LP8s415vKK5K/9o//qey1sSftmC/K+yqEThFDRkvs8wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR0HfXhEae10BzCmr500Nn3
-8YWFMjANBgkqhkiG9w0BAQUFAAOCAQEACg3TqtHJvs8GnYnDp8Z7mQRsnACPJ9nq
-vPJPB/S2Z4lBqEPjiPbdMvhm72+kc57ISRu9EovxNJuAfhp+vlB1Wrvlkd2PNWbj
-/mBWAl7Kau81mfKS6Gsz8whEhDuB+h4W9m4Oo/wROF+mG58drOpGhRB7W83OUL2F
-gM2APTNWe7QD6yfS3Amb8SxVjxx1F3/Z9L5sZ0IC6yUOqN83dZxmy3MaOSdmoPGf
-QZk1HMxJXgH460Iw71JxrXd/1SFpI0LdLaou4/IbEXEeCh0GeNOWp7DCqOTlYFTs
-EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
-</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://nya-05.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIReNeBJNo61MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI2WhcNMjAwOTE0
-MTQ0NzI2WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3lPw44dhmSAYWtNxxtwuMhhsz2/C+hda
-NoGunH6sV737/wX9533Ym66ID8zxT16WNsQL8K7WTHKCth29MddlgbKwCnnCUMsP
-PPNnW5DG57t0zSL7Szgsz/Ay5HNxv57mEAb5//ZLV+xkLRXgAIizdql5nLUO3uUe
-QrGVd8xN6DCPEwcKkUAwGnFPK/aaEiIqlebj48WW/lAzyQf24MwHpP+zakjXmlN+
-wgh9GS7aSN2G9DqSbUR19qV3rcYZRpHRsXoiYbqhX4TU5rSZY0GknaJFUzZsYYTq
-uLAT+zKjg99LP8s415vKK5K/9o//qey1sSftmC/K+yqEThFDRkvs8wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR0HfXhEae10BzCmr500Nn3
-8YWFMjANBgkqhkiG9w0BAQUFAAOCAQEACg3TqtHJvs8GnYnDp8Z7mQRsnACPJ9nq
-vPJPB/S2Z4lBqEPjiPbdMvhm72+kc57ISRu9EovxNJuAfhp+vlB1Wrvlkd2PNWbj
-/mBWAl7Kau81mfKS6Gsz8whEhDuB+h4W9m4Oo/wROF+mG58drOpGhRB7W83OUL2F
-gM2APTNWe7QD6yfS3Amb8SxVjxx1F3/Z9L5sZ0IC6yUOqN83dZxmy3MaOSdmoPGf
-QZk1HMxJXgH460Iw71JxrXd/1SFpI0LdLaou4/IbEXEeCh0GeNOWp7DCqOTlYFTs
-EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 17f8cbb7..00000000
--- a/swamid-1.0/nya-05.ladok.umu.se-ecs-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://nya-05.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-05.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPYOrikgCEZNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI3WhcNMjAwOTE0
-MTQ0NzI3WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr0eRo5HrlJHjxgAY0vangKmidk0FoGcg
-7SJYKs07vNwLUfHt4MzVCan8Kdobtbst6Xf8uNcqGfNL3YC6oWI5XOV//bjqRqnh
-OHiWKYB4wfYN1MgIjKUNJ+t0hNxIr260GybxIiZV9+iziVsHPt55EiaXClhEG9x1
-4oQChcaBcxaBpE0xQnSgJyFvkJkW3nSJXFLMkCGmPIy66JETQ9DPWEZD/qigD08n
-EyPASwuYP1Rm0vfz6zKPKETsJTQj+gDT8bShD0H/QWCAg8qPXeRb2V1uJyKAFfCJ
-6jaZORoddX2fE/v50efTHS7+IKMxCmPGPLeTL1u6YQ8YGEVBMkCbrQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRG5T3LrJ0xZ9TaKQSgPZGC
-VLByOjANBgkqhkiG9w0BAQUFAAOCAQEAn1C71xkeqdvW3avWlYECejReh+Wao7iy
-ji0KtkRcOn+7s1+EOlRlGFte9xU5CgytaehJfVRUjRmIrmBI3PvCmFIA39198U/u
-HlUH+wFzNxiQupAv6I1Ncz/PvA6FFMbengLvrb7umzTdWO/H3a495IaRBFT3Fat+
-yVVLr3nmGwMLM+kkk49KfvqTSM3QsoP9qDCU82S0zZJIiXcB6qLXnEU8EOY1vjn2
-PK4rpcde+hTqL8qtLia3p3AaP9nfwSs5RO/xMYfXao8ZIeMCjGO95X7mYuYNLOSj
-oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
-</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://nya-05.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPYOrikgCEZNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI3WhcNMjAwOTE0
-MTQ0NzI3WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr0eRo5HrlJHjxgAY0vangKmidk0FoGcg
-7SJYKs07vNwLUfHt4MzVCan8Kdobtbst6Xf8uNcqGfNL3YC6oWI5XOV//bjqRqnh
-OHiWKYB4wfYN1MgIjKUNJ+t0hNxIr260GybxIiZV9+iziVsHPt55EiaXClhEG9x1
-4oQChcaBcxaBpE0xQnSgJyFvkJkW3nSJXFLMkCGmPIy66JETQ9DPWEZD/qigD08n
-EyPASwuYP1Rm0vfz6zKPKETsJTQj+gDT8bShD0H/QWCAg8qPXeRb2V1uJyKAFfCJ
-6jaZORoddX2fE/v50efTHS7+IKMxCmPGPLeTL1u6YQ8YGEVBMkCbrQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRG5T3LrJ0xZ9TaKQSgPZGC
-VLByOjANBgkqhkiG9w0BAQUFAAOCAQEAn1C71xkeqdvW3avWlYECejReh+Wao7iy
-ji0KtkRcOn+7s1+EOlRlGFte9xU5CgytaehJfVRUjRmIrmBI3PvCmFIA39198U/u
-HlUH+wFzNxiQupAv6I1Ncz/PvA6FFMbengLvrb7umzTdWO/H3a495IaRBFT3Fat+
-yVVLr3nmGwMLM+kkk49KfvqTSM3QsoP9qDCU82S0zZJIiXcB6qLXnEU8EOY1vjn2
-PK4rpcde+hTqL8qtLia3p3AaP9nfwSs5RO/xMYfXao8ZIeMCjGO95X7mYuYNLOSj
-oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 44cffff7..00000000
--- a/swamid-1.0/nya-06.ladok.umu.se-aws-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://nya-06.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-06.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/gTs3dP8wBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI5WhcNMjAwOTE0
-MTQ0NzI5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6x+9mrbiCY2RwW9EXwsJaIxzWZxqahcV
-8laWoZY+K6V+Ufm34cRin6ca8CsCRzdfvS8XukuIPeY/1Zn5alsFDGOCtnPD8rLe
-Ee1XQmoIWMV2mz2Z576jB3AboImMDbFAicqA9zwh4rc56asUX9iR/JgUvgD8c0l/
-/dXAo96oEv/ui5h4P0+xwu4oDqEQtFe3IbuV403aEmqXLzacxDIFwhY3HkMl1TTd
-EjNgq0HjN1Mcv9BMU7LavefOLsSEf3jmtOMHmmZkdXfk9jjXyBqbcdG33Zymxm8n
-23ZLWWtK6HdrNeFpzuAfVLr0d3PoXQrAdu3mCUlHjBq317PoHEQIKwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSljX1Nk5HVZ3ts7U1n29lH
-R+xGiTANBgkqhkiG9w0BAQUFAAOCAQEAODHC7tK9BzD2rP70OCe+Zr5cMoKHvTAH
-0f4fWVy/LbQe43rOlhJtGt9C/Q/LDoPupv7SlH1LJGewgX2cJ+KGVnhFISNydVot
-XzR/9IJPtG9JuJqCG6CEIsVLM+vghs1S6wvXacZOcz8KeMBa18l5mIMdYSNIhqX/
-vjvqobojumadEw61UrpaSmDKTvotgUpuzy59U+4sip74sFf7RaoaxgJuLjQcpf5R
-dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
-6Ie2rVKlj8v7JXVwju3yJ8idFo6BjZ/CVWk7hcdF+jH2sHLcjZkhvA==
-</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://nya-06.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/gTs3dP8wBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI5WhcNMjAwOTE0
-MTQ0NzI5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6x+9mrbiCY2RwW9EXwsJaIxzWZxqahcV
-8laWoZY+K6V+Ufm34cRin6ca8CsCRzdfvS8XukuIPeY/1Zn5alsFDGOCtnPD8rLe
-Ee1XQmoIWMV2mz2Z576jB3AboImMDbFAicqA9zwh4rc56asUX9iR/JgUvgD8c0l/
-/dXAo96oEv/ui5h4P0+xwu4oDqEQtFe3IbuV403aEmqXLzacxDIFwhY3HkMl1TTd
-EjNgq0HjN1Mcv9BMU7LavefOLsSEf3jmtOMHmmZkdXfk9jjXyBqbcdG33Zymxm8n
-23ZLWWtK6HdrNeFpzuAfVLr0d3PoXQrAdu3mCUlHjBq317PoHEQIKwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSljX1Nk5HVZ3ts7U1n29lH
-R+xGiTANBgkqhkiG9w0BAQUFAAOCAQEAODHC7tK9BzD2rP70OCe+Zr5cMoKHvTAH
-0f4fWVy/LbQe43rOlhJtGt9C/Q/LDoPupv7SlH1LJGewgX2cJ+KGVnhFISNydVot
-XzR/9IJPtG9JuJqCG6CEIsVLM+vghs1S6wvXacZOcz8KeMBa18l5mIMdYSNIhqX/
-vjvqobojumadEw61UrpaSmDKTvotgUpuzy59U+4sip74sFf7RaoaxgJuLjQcpf5R
-dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
-6Ie2rVKlj8v7JXVwju3yJ8idFo6BjZ/CVWk7hcdF+jH2sHLcjZkhvA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 286c4e04..00000000
--- a/swamid-1.0/nya-06.ladok.umu.se-ecs-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://nya-06.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-06.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
-MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
-UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
-TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
-54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
-8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
-NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
-2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
-67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
-NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
-O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
-08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
-vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
-</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://nya-06.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
-MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
-UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
-TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
-54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
-8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
-NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
-2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
-67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
-NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
-O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
-08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
-vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 79032739..00000000
--- a/swamid-1.0/nya-07.ladok.umu.se-aws-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://nya-07.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-07.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMBbpJvMFWysMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMyWhcNMjAwOTE0
-MTQ0NzMyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA02uMlRcS6ZmG3e8sBUxN0JS4jxGd9XgB
-Gv5rEoy8zwJ8x/FjMqmKoebTNhr5+l+pnvT3eIrRCfvgJpvu5tfO62GnClK3Fijo
-Xbnxu3q+IP97D+A6VnNcaemcsSHQrSS0xUHlczRTO3pqy0ss6xoLjLcsH6Fz1wTJ
-0SaN5ipmwAr9NekKkwacbnCaHcE7bMN5+GGIe12M1kWkWEsx4wb5i5gjxcqJdAM3
-J1st0vbAxc5U0jeDLG7R6tDdZztkXyCVjIHoh0i68tFypBQQ8y+BTe5RNL+iOL86
-zpGjd3oO+QCvgz5jPB+ZeQSZUlSzmYa2VTJFmIn4yKzUB/le3v8I8QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRnPf6btAEHWpUCiH4MCgXt
-txw1wzANBgkqhkiG9w0BAQUFAAOCAQEAckT4x/jfu2n58E6Lqnh5BEtVTc+Cd6Fv
-yLIxQBhZjczigt5mEH2OnA+1RpllchMrhdW6ymlNYimaB4VdNhM3uMfiv5BPs7X6
-8hyTo9f7/PXUDaZHzZKQn14NFNtXE/MpliV7jpGNvyVCx+T8B3W+ol9sOgSvd5E8
-IwvPC2CsDwbvQ8+tvTTVHgT4jiOixGzoN1uMyx5kKDjbymkUa7LZa84wCJNyeJcB
-JfbEFjH5PIOZUxKzbdtaGUguUNQWOmGKy8Y7nH7mNKF8Nc/IaKqCjfnoSJSt+r/p
-OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
-</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://nya-07.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMBbpJvMFWysMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMyWhcNMjAwOTE0
-MTQ0NzMyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA02uMlRcS6ZmG3e8sBUxN0JS4jxGd9XgB
-Gv5rEoy8zwJ8x/FjMqmKoebTNhr5+l+pnvT3eIrRCfvgJpvu5tfO62GnClK3Fijo
-Xbnxu3q+IP97D+A6VnNcaemcsSHQrSS0xUHlczRTO3pqy0ss6xoLjLcsH6Fz1wTJ
-0SaN5ipmwAr9NekKkwacbnCaHcE7bMN5+GGIe12M1kWkWEsx4wb5i5gjxcqJdAM3
-J1st0vbAxc5U0jeDLG7R6tDdZztkXyCVjIHoh0i68tFypBQQ8y+BTe5RNL+iOL86
-zpGjd3oO+QCvgz5jPB+ZeQSZUlSzmYa2VTJFmIn4yKzUB/le3v8I8QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRnPf6btAEHWpUCiH4MCgXt
-txw1wzANBgkqhkiG9w0BAQUFAAOCAQEAckT4x/jfu2n58E6Lqnh5BEtVTc+Cd6Fv
-yLIxQBhZjczigt5mEH2OnA+1RpllchMrhdW6ymlNYimaB4VdNhM3uMfiv5BPs7X6
-8hyTo9f7/PXUDaZHzZKQn14NFNtXE/MpliV7jpGNvyVCx+T8B3W+ol9sOgSvd5E8
-IwvPC2CsDwbvQ8+tvTTVHgT4jiOixGzoN1uMyx5kKDjbymkUa7LZa84wCJNyeJcB
-JfbEFjH5PIOZUxKzbdtaGUguUNQWOmGKy8Y7nH7mNKF8Nc/IaKqCjfnoSJSt+r/p
-OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 7a1cee32..00000000
--- a/swamid-1.0/nya-07.ladok.umu.se-ecs-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://nya-07.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-07.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
-MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
-bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
-5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
-hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
-EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
-o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
-/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
-48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
-fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
-CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
-wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
-OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
-</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://nya-07.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
-MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
-bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
-5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
-hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
-EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
-o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
-/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
-48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
-fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
-CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
-wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
-OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 529a49d0..00000000
--- a/swamid-1.0/nya-08.ladok.umu.se-aws-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://nya-08.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-08.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOFAFriMiS0qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM1WhcNMjAwOTE0
-MTQ0NzM1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2B8p2uzEoAoJrII3VKQUfOQRqGKDVlLM
-sEL+1K6eVudV1jXIcSdOzeZGixr+yzNmgR+5ABtZNz26oaox2WEAOviw3Bo7p9N7
-RHP02lslKfs+zi8IlhVM5fvEC7S/IxcViZGkcbgK5387co4TfPJoIWBOUOp4HNMW
-/CKsx84FPd4Hz4R7EeT70YdBAwB3nBZ4Ia7ImGq6OxxUAK5KFa+7Jx2F2YnuKMHW
-hzx6cE5cevuMBbjG8v2An7gpbQgTa4pHK683yEBF/vLP3lRkWdEVVRe3GQzGGR/G
-ovRoFXt6aCbxK5uFykvBSE698Ku6c7gRE3ivbyTnDNANwBJ1qvPPwwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR3nEpFrQRGejZj2h2Jms3a
-+L5t2DANBgkqhkiG9w0BAQUFAAOCAQEAlU5RK7F91Qm7hNWPc8GVzg5VODc9JvgA
-c43VCyJ4xDWqiWu/ewuTi+eoPRD9B/a3IUrCJnqNEJbAJrDgnEv5D4MeJfrQ1g5w
-qT9vCN5E7/kx8o5gKSD6oLqJ7Ev9vnn1YPjvya/51iqgPtPm3UIAnO1Rm5Xa3bDk
-KsvRIztNRobqzEKKth2ezfYxoY7AJe8aT2A0Cw+TVrnQKqUxRth3Q8kBKocH4jd7
-2gNkBfvx9gk9214iuJcs10Hs+Nw8llwiOUYCDi6Xp4HiixeFrpPblSjpy0UCTvZ2
-iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
-</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://nya-08.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOFAFriMiS0qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM1WhcNMjAwOTE0
-MTQ0NzM1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2B8p2uzEoAoJrII3VKQUfOQRqGKDVlLM
-sEL+1K6eVudV1jXIcSdOzeZGixr+yzNmgR+5ABtZNz26oaox2WEAOviw3Bo7p9N7
-RHP02lslKfs+zi8IlhVM5fvEC7S/IxcViZGkcbgK5387co4TfPJoIWBOUOp4HNMW
-/CKsx84FPd4Hz4R7EeT70YdBAwB3nBZ4Ia7ImGq6OxxUAK5KFa+7Jx2F2YnuKMHW
-hzx6cE5cevuMBbjG8v2An7gpbQgTa4pHK683yEBF/vLP3lRkWdEVVRe3GQzGGR/G
-ovRoFXt6aCbxK5uFykvBSE698Ku6c7gRE3ivbyTnDNANwBJ1qvPPwwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR3nEpFrQRGejZj2h2Jms3a
-+L5t2DANBgkqhkiG9w0BAQUFAAOCAQEAlU5RK7F91Qm7hNWPc8GVzg5VODc9JvgA
-c43VCyJ4xDWqiWu/ewuTi+eoPRD9B/a3IUrCJnqNEJbAJrDgnEv5D4MeJfrQ1g5w
-qT9vCN5E7/kx8o5gKSD6oLqJ7Ev9vnn1YPjvya/51iqgPtPm3UIAnO1Rm5Xa3bDk
-KsvRIztNRobqzEKKth2ezfYxoY7AJe8aT2A0Cw+TVrnQKqUxRth3Q8kBKocH4jd7
-2gNkBfvx9gk9214iuJcs10Hs+Nw8llwiOUYCDi6Xp4HiixeFrpPblSjpy0UCTvZ2
-iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 27e15db9..00000000
--- a/swamid-1.0/nya-08.ladok.umu.se-ecs-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://nya-08.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-08.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKY6wQXl/OYdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE1MjUxWhcNMjAwODE2
-MTE1MjUxWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOKXz8CyzuOeG3QWk7OHEuXvv6aSv555
-5NqUJpvr55pqHbwaoxcGimEaJhIt8KI8ZfIuQ+doY8cSfYcm6YVJqVp85uG0fE6S
-BC3jSQunEZcziVB+vAX5G4eguLPuW/x2wFlHwzRAT6tRvoezmW4+hJrnOZgAFScJ
-LOHdmFYiMXXPF2f3k1GQtgzj1F/bE1CVyJGunihONwPXOXNODrsmlFqLV7IXK9RB
-LMFgN2ypxRFkB7mXl/7EESMV6l9ISxDQlPrC4Plbbp4Qxf3ob65Y3R/c8o/5TuNx
-ZLm6jUaxQZITiPGpFeXkhFf+xa+imJobvsSuOmO43K7QtoxLDOBXWQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS66LMAll0wKzUBqKSP+CbH
-2lD4EjANBgkqhkiG9w0BAQUFAAOCAQEAAuSg1kVvHbowjjfvEbI6R0eT6x1bkeja
-TseD2XjH53ZMNP5u5JSqqaYQILEYlMXmb4ALIup+TU/zYGoPP+IisR6ggKDmeMp0
-1HYV1jXr822BcV6eASILlDuqHEN63tqaSbyjbhSQxUBimU+GqhGA1HJO+PdCd7uf
-Zom+8+Pf3B+LgdhUiJ7VB+ttIlCg7Z+k3oCBdOgW1b6E57A6IlvetbF9PraCtsCG
-h8vkUuVg5GOCJbvf4gADKXl2aLwSR40Roo4qlVHkhNT7J4BVPiY5CunZzC06fAE8
-LBzTjleTsC/pW9Q2h6AMt2Nc+k+LhT74yBBqLusMMmirA6l96Ajn7g==
-</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://nya-08.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKY6wQXl/OYdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE1MjUxWhcNMjAwODE2
-MTE1MjUxWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOKXz8CyzuOeG3QWk7OHEuXvv6aSv555
-5NqUJpvr55pqHbwaoxcGimEaJhIt8KI8ZfIuQ+doY8cSfYcm6YVJqVp85uG0fE6S
-BC3jSQunEZcziVB+vAX5G4eguLPuW/x2wFlHwzRAT6tRvoezmW4+hJrnOZgAFScJ
-LOHdmFYiMXXPF2f3k1GQtgzj1F/bE1CVyJGunihONwPXOXNODrsmlFqLV7IXK9RB
-LMFgN2ypxRFkB7mXl/7EESMV6l9ISxDQlPrC4Plbbp4Qxf3ob65Y3R/c8o/5TuNx
-ZLm6jUaxQZITiPGpFeXkhFf+xa+imJobvsSuOmO43K7QtoxLDOBXWQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS66LMAll0wKzUBqKSP+CbH
-2lD4EjANBgkqhkiG9w0BAQUFAAOCAQEAAuSg1kVvHbowjjfvEbI6R0eT6x1bkeja
-TseD2XjH53ZMNP5u5JSqqaYQILEYlMXmb4ALIup+TU/zYGoPP+IisR6ggKDmeMp0
-1HYV1jXr822BcV6eASILlDuqHEN63tqaSbyjbhSQxUBimU+GqhGA1HJO+PdCd7uf
-Zom+8+Pf3B+LgdhUiJ7VB+ttIlCg7Z+k3oCBdOgW1b6E57A6IlvetbF9PraCtsCG
-h8vkUuVg5GOCJbvf4gADKXl2aLwSR40Roo4qlVHkhNT7J4BVPiY5CunZzC06fAE8
-LBzTjleTsC/pW9Q2h6AMt2Nc+k+LhT74yBBqLusMMmirA6l96Ajn7g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index fa86dcd0..00000000
--- a/swamid-1.0/nya-09.ladok.umu.se-aws-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://nya-09.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-09.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
-MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
-I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
-SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
-I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
-rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
-qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
-9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
-atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
-qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
-MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
-p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
-O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
-</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://nya-09.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
-MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
-I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
-SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
-I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
-rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
-qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
-9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
-atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
-qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
-MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
-p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
-O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 0651a2fa..00000000
--- a/swamid-1.0/nya-09.ladok.umu.se-ecs-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://nya-09.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-09.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
-MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
-1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
-xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
-scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
-KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
-vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
-5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
-5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
-eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
-ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
-Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
-ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
-</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://nya-09.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
-MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
-1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
-xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
-scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
-KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
-vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
-5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
-5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
-eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
-ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
-Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
-ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 81b0b13c..00000000
--- a/swamid-1.0/nya-10.ladok.umu.se-aws-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://nya-10.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-10.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
-MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
-5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
-5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
-naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
-hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
-hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
-GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
-FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
-vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
-uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
-Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
-dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
-</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://nya-10.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
-MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
-5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
-5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
-naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
-hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
-hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
-GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
-FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
-vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
-uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
-Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
-dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 73ab1c34..00000000
--- a/swamid-1.0/nya-10.ladok.umu.se-ecs-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://nya-10.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-10.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
-MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
-ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
-crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
-Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
-KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
-6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
-/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
-5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
-JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
-pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
-zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
-H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
-</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://nya-10.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
-MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
-ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
-crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
-Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
-KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
-6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
-/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
-5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
-JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
-pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
-zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
-H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-aws-sp.xml b/swamid-1.0/wb11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 867b32b2..00000000
--- a/swamid-1.0/wb11.ladok.umu.se-aws-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://wb11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://wb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAMtkfsQuw4jrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMFoXDTIwMDkxNDE0
-NDgwMFowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDZo2PhhMygEkhrL9aOI9juCAd8mMUzAjMvOyeM
-XaRvy0TWAosbYrISzJ5RRhlz8fISbJBi5fNc4EXfOwhwt+zDRO38WD6ZQ6tIingg
-/MDlt7kAIReVApqzFpuz+KyJTTnkUCBG88Ta+mS/8ueQLtT0bRWraRktjbsh64By
-fJyxjvxQrCIvL73KFb9UQ9pDOHd6MiBSd5CI4bTUoEtTZ029008PGVNJuW1h8qUJ
-cEmlzs9XICkO2/FwH5ZNitjR17QDPuqSs2XoUuhiLENKbPrd4QJmeo/T+Sdd4NID
-duiVDLGRHoQhwKoFW4CeQ08RhVT+NSJhk00w4NtomCiVKnLhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUm72guLzA9qOEzsfksOLm7Qc6qfIwDQYJ
-KoZIhvcNAQEFBQADggEBAI3pgPZcnnJiJ+s69Jn9jwX6JNkN/5WedCSNy3qdNCpU
-RIyxKvEXBcfeWcA6GLeXGYpEtkyPZETh9ED9ulkj++Ve/80aA19hmIpCFBT8jtjO
-ds7YJbL6KekyJrAdI3fKkEsrtbNLrC+2c8oeGDyifffa66bAOr4YwAOFLcsSGnCg
-OCOkAB0kG4D+JL3wUj/Ss4t3wcQeXf0o1HbF5KGJVntPYczwSWoYttsghzBWD7rH
-Jh6Z+4xY6ghKm2UzuXdEojHvbL9/R8qxsJt/ZsD6eRc5zvH8CBGhwJQ4snkUU1Xd
-r47Cpg6APAhpPp1KRCo+dy+2rnvbmWi8LukIaSt25UI=
-</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://wb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAMtkfsQuw4jrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMFoXDTIwMDkxNDE0
-NDgwMFowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDZo2PhhMygEkhrL9aOI9juCAd8mMUzAjMvOyeM
-XaRvy0TWAosbYrISzJ5RRhlz8fISbJBi5fNc4EXfOwhwt+zDRO38WD6ZQ6tIingg
-/MDlt7kAIReVApqzFpuz+KyJTTnkUCBG88Ta+mS/8ueQLtT0bRWraRktjbsh64By
-fJyxjvxQrCIvL73KFb9UQ9pDOHd6MiBSd5CI4bTUoEtTZ029008PGVNJuW1h8qUJ
-cEmlzs9XICkO2/FwH5ZNitjR17QDPuqSs2XoUuhiLENKbPrd4QJmeo/T+Sdd4NID
-duiVDLGRHoQhwKoFW4CeQ08RhVT+NSJhk00w4NtomCiVKnLhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUm72guLzA9qOEzsfksOLm7Qc6qfIwDQYJ
-KoZIhvcNAQEFBQADggEBAI3pgPZcnnJiJ+s69Jn9jwX6JNkN/5WedCSNy3qdNCpU
-RIyxKvEXBcfeWcA6GLeXGYpEtkyPZETh9ED9ulkj++Ve/80aA19hmIpCFBT8jtjO
-ds7YJbL6KekyJrAdI3fKkEsrtbNLrC+2c8oeGDyifffa66bAOr4YwAOFLcsSGnCg
-OCOkAB0kG4D+JL3wUj/Ss4t3wcQeXf0o1HbF5KGJVntPYczwSWoYttsghzBWD7rH
-Jh6Z+4xY6ghKm2UzuXdEojHvbL9/R8qxsJt/ZsD6eRc5zvH8CBGhwJQ4snkUU1Xd
-r47Cpg6APAhpPp1KRCo+dy+2rnvbmWi8LukIaSt25UI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml b/swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 346241b9..00000000
--- a/swamid-1.0/wb11.ladok.umu.se-ecs-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://wb11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://wb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKzpSaecCMeLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0
-NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC7iP80GpxV9jpwwo8qbnqg+tpc1D9biCcAaZGj
-e6A8uwVaC0dsRChltTBpsxfQdT+YT6tbSWQ1RQ5JMua4F1MuxtVzfbBuTF/u1jRb
-AtN/uSmVpsBXet3flPkbENWy0pc0KU99Vu0DS70tNiAHt942qdwpBn4u4/z5y4Pk
-vGE4WZbGyVfZOK8VeLDgz9JLcTzi2xNPFG5RBteGzCTGzsxzNODOkPHuBUAP2Vjm
-4NcQHDPX3xwxgUAtbfy34z74BCbcASENGkVi9FHSxqykSM2HoMTNKzDBvGiy1uIh
-I1RsUZKI3czalgYiIcqX3RBscq7VFuNhnfQ7aH7xtF3NqoHzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUhIcWQkZm1C4Jz03+4cl4cLXJH5UwDQYJ
-KoZIhvcNAQEFBQADggEBAIy3RxG8R6m4MwTY9by9FwzbOovhWKRJ3oN6IEwOQD/l
-x9USAEs+uVGY9DVZOW9ZnXJMndCmsVpR4SX/mRPYwEzmBEx/oQK93Bj3Bp4rFkHE
-SBDWuasgJbrWXHPQzDqL/STrqvcj7ttmnK+JUEB7th1IM9Qt2DLUgxXcNjJrQc1x
-V48Uw+hzOetz9i3aovFjaQjnsOSLOUoUJIhlT32KMVe6Y4zSCMR8ggp6RI3mX7VO
-GMabpEOjrhPmP5iIDUG2GyO3U0msnY+efBenO2kXIifxrBPEfsbLG33zGmpEYC+w
-rc/DV3C2sj0TQkCAZuxvmmM4YpmAOJ7QMQzUUY4sOHU=
-</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://wb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKzpSaecCMeLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0
-NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC7iP80GpxV9jpwwo8qbnqg+tpc1D9biCcAaZGj
-e6A8uwVaC0dsRChltTBpsxfQdT+YT6tbSWQ1RQ5JMua4F1MuxtVzfbBuTF/u1jRb
-AtN/uSmVpsBXet3flPkbENWy0pc0KU99Vu0DS70tNiAHt942qdwpBn4u4/z5y4Pk
-vGE4WZbGyVfZOK8VeLDgz9JLcTzi2xNPFG5RBteGzCTGzsxzNODOkPHuBUAP2Vjm
-4NcQHDPX3xwxgUAtbfy34z74BCbcASENGkVi9FHSxqykSM2HoMTNKzDBvGiy1uIh
-I1RsUZKI3czalgYiIcqX3RBscq7VFuNhnfQ7aH7xtF3NqoHzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUhIcWQkZm1C4Jz03+4cl4cLXJH5UwDQYJ
-KoZIhvcNAQEFBQADggEBAIy3RxG8R6m4MwTY9by9FwzbOovhWKRJ3oN6IEwOQD/l
-x9USAEs+uVGY9DVZOW9ZnXJMndCmsVpR4SX/mRPYwEzmBEx/oQK93Bj3Bp4rFkHE
-SBDWuasgJbrWXHPQzDqL/STrqvcj7ttmnK+JUEB7th1IM9Qt2DLUgxXcNjJrQc1x
-V48Uw+hzOetz9i3aovFjaQjnsOSLOUoUJIhlT32KMVe6Y4zSCMR8ggp6RI3mX7VO
-GMabpEOjrhPmP5iIDUG2GyO3U0msnY+efBenO2kXIifxrBPEfsbLG33zGmpEYC+w
-rc/DV3C2sj0TQkCAZuxvmmM4YpmAOJ7QMQzUUY4sOHU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml b/swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 94540810..00000000
--- a/swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.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.studera.testc.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
-y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
-OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
-QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
-n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
-3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
-5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
-MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
-UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
-53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
-iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
-KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
-Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
-</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://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
-y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
-OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
-QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
-n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
-3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
-5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
-MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
-UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
-53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
-iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
-KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
-Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml b/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 6d5429ef..00000000
--- a/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.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.studera.testd.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
-eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
-bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
-FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
-WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
-goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
-QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
-MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
-lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
-v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
-To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
-DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
-dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
-</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://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
-eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
-bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
-FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
-WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
-goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
-QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
-MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
-lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
-v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
-To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
-DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
-dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml b/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml
index ed639a43..ed639a43 100644
--- a/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml
+++ b/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml
diff --git a/nya-1.0/dwidp.antagning.se-dw-idp.xml b/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml
index f96a3e32..f96a3e32 100644
--- a/nya-1.0/dwidp.antagning.se-dw-idp.xml
+++ b/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml
diff --git a/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml b/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
index ddc03c28..ddc03c28 100644
--- a/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml
+++ b/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0-obsolete/fs.liu.se-adfs-services-trust.xml
index 20d196c7..20d196c7 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0-obsolete/fs.liu.se-adfs-services-trust.xml
diff --git a/nya-1.0/ft10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml
index 3f9f3991..3f9f3991 100644
--- a/nya-1.0/ft10.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml
diff --git a/nya-1.0/ft10.ladok.umu.se-shibboleth-sp.xml b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml
index 764c6527..764c6527 100644
--- a/nya-1.0/ft10.ladok.umu.se-shibboleth-sp.xml
+++ b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/idp.hgo.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml
index ebf390a0..ebf390a0 100644
--- a/swamid-1.0/idp.hgo.se-idp-shibboleth.xml
+++ b/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
index ab880659..ab880659 100644
--- a/swamid-1.0/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
diff --git a/swamid-1.0/idp.lhs.se-identity.xml b/swamid-2.0-obsolete/idp.lhs.se-identity.xml
index d7b520c3..d7b520c3 100644
--- a/swamid-1.0/idp.lhs.se-identity.xml
+++ b/swamid-2.0-obsolete/idp.lhs.se-identity.xml
diff --git a/swamid-1.0/idp.secure.su.se-identity.xml b/swamid-2.0-obsolete/idp.secure.su.se-identity.xml
index 718248a3..718248a3 100644
--- a/swamid-1.0/idp.secure.su.se-identity.xml
+++ b/swamid-2.0-obsolete/idp.secure.su.se-identity.xml
diff --git a/swamid-1.0/idp.test.umu.se-identity.xml b/swamid-2.0-obsolete/idp.test.umu.se-identity.xml
index 9b301645..9b301645 100644
--- a/swamid-1.0/idp.test.umu.se-identity.xml
+++ b/swamid-2.0-obsolete/idp.test.umu.se-identity.xml
diff --git a/swamid-1.0/idp.umu.se-shib13-idp-metadata.php.xml b/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml
index 500b3a78..500b3a78 100644
--- a/swamid-1.0/idp.umu.se-shib13-idp-metadata.php.xml
+++ b/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml
diff --git a/swamid-1.0/idp1.irf.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml
index 3e14b10f..3e14b10f 100644
--- a/swamid-1.0/idp1.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp1.unit.liu.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml
index 02bffddc..02bffddc 100644
--- a/swamid-1.0/idp1.unit.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/medieportaltest.kau.se-shibboleth.xml b/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml
index fee019fe..fee019fe 100644
--- a/swamid-1.0/medieportaltest.kau.se-shibboleth.xml
+++ b/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml
diff --git a/nya-1.0/nb10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml
index 2480663f..2480663f 100644
--- a/nya-1.0/nb10.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml
diff --git a/nya-1.0/nb10.ladok.umu.se-shibboleth-sp.xml b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml
index 09765aea..09765aea 100644
--- a/nya-1.0/nb10.ladok.umu.se-shibboleth-sp.xml
+++ b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/roundup.it.su.se.xml b/swamid-2.0-obsolete/roundup.it.su.se.xml
index c1393c6c..c1393c6c 100644
--- a/swamid-1.0/roundup.it.su.se.xml
+++ b/swamid-2.0-obsolete/roundup.it.su.se.xml
diff --git a/swamid-1.0/shib-sp-test.oru.se-shibboleth.xml b/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml
index 5f320eec..5f320eec 100644
--- a/swamid-1.0/shib-sp-test.oru.se-shibboleth.xml
+++ b/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml
diff --git a/swamid-1.0/shibboleth.sys.kth.se-identity.xml b/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml
index e200e851..e200e851 100644
--- a/swamid-1.0/shibboleth.sys.kth.se-identity.xml
+++ b/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml
diff --git a/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml b/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml
index c34cb206..c34cb206 100644
--- a/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml
+++ b/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml
diff --git a/nya-1.0/vhs-shib.no-ip.org-shibboleth-sp.xml b/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml
index f943c860..f943c860 100644
--- a/nya-1.0/vhs-shib.no-ip.org-shibboleth-sp.xml
+++ b/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml
diff --git a/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml b/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml
index 0f0986cc..0f0986cc 100644
--- a/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml
diff --git a/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml b/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml
index f621984e..f621984e 100644
--- a/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/www.student.teol.uu.se.xml b/swamid-2.0-obsolete/www.student.teol.uu.se.xml
index 3b452497..3b452497 100644
--- a/swamid-1.0/www.student.teol.uu.se.xml
+++ b/swamid-2.0-obsolete/www.student.teol.uu.se.xml
diff --git a/swamid-1.0/www.studera.nu-shibboleth-sp.xml b/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml
index 4ced63eb..4ced63eb 100644
--- a/swamid-1.0/www.studera.nu-shibboleth-sp.xml
+++ b/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml
diff --git a/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml b/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml
index 94540810..94540810 100644
--- a/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml
diff --git a/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml b/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml
index 6d5429ef..6d5429ef 100644
--- a/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/www2.student.teol.uu.se.xml b/swamid-2.0-obsolete/www2.student.teol.uu.se.xml
index b37209df..b37209df 100644
--- a/swamid-1.0/www2.student.teol.uu.se.xml
+++ b/swamid-2.0-obsolete/www2.student.teol.uu.se.xml
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8085-sp.xml b/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml
index 8ffa9fb0..8ffa9fb0 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8085-sp.xml
+++ b/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml
diff --git a/nya-1.0/ab11.ladok.umu.se-aws-sp.xml b/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml
index 4ed32872..4ed32872 100644
--- a/nya-1.0/ab11.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml b/swamid-2.0/ab11.ladok.umu.se-dw-idp.xml
index 44809ae2..44809ae2 100644
--- a/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/ab11.ladok.umu.se-dw-idp.xml
diff --git a/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/ab11.ladok.umu.se-ecs-sp.xml
index d02ad98d..d02ad98d 100644
--- a/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/ab11.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml
index 6e92fe4c..6e92fe4c 100644
--- a/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml b/swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml
index 203c84e4..203c84e4 100644
--- a/swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml
+++ b/swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/account.liu.se-shibboleth-sp.xml b/swamid-2.0/account.liu.se-shibboleth-sp.xml
index f07836f7..f07836f7 100644
--- a/swamid-1.0/account.liu.se-shibboleth-sp.xml
+++ b/swamid-2.0/account.liu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/account.mdh.se-shibboleth.xml b/swamid-2.0/account.mdh.se-shibboleth.xml
index 9658adc2..9658adc2 100644
--- a/swamid-1.0/account.mdh.se-shibboleth.xml
+++ b/swamid-2.0/account.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/accountcheckout.lnu.se.xml b/swamid-2.0/accountcheckout.lnu.se.xml
index 3c3196d0..3c3196d0 100644
--- a/swamid-1.0/accountcheckout.lnu.se.xml
+++ b/swamid-2.0/accountcheckout.lnu.se.xml
diff --git a/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
index c233af24..c233af24 100644
--- a/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
diff --git a/swamid-1.0/akino.hh.se-shibboleth.xml b/swamid-2.0/akino.hh.se-shibboleth.xml
index 232c0992..232c0992 100644
--- a/swamid-1.0/akino.hh.se-shibboleth.xml
+++ b/swamid-2.0/akino.hh.se-shibboleth.xml
diff --git a/nya-1.0/aktivera-test.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
index af7e9088..af7e9088 100644
--- a/nya-1.0/aktivera-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
diff --git a/nya-1.0/aktivera.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
index 7f37b482..7f37b482 100644
--- a/nya-1.0/aktivera.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/aktivering.db.umu.se-shibboleth.xml b/swamid-2.0/aktivering.db.umu.se-shibboleth.xml
index 67e6f1a7..67e6f1a7 100644
--- a/swamid-1.0/aktivering.db.umu.se-shibboleth.xml
+++ b/swamid-2.0/aktivering.db.umu.se-shibboleth.xml
diff --git a/swamid-1.0/alpha.kib.ki.se-shibboleth.xml b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml
index 778d36bb..778d36bb 100644
--- a/swamid-1.0/alpha.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/amiga.kib.ki.se-shibboleth.xml b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml
index e78b7388..e78b7388 100644
--- a/swamid-1.0/amiga.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/at11.ladok.umu.se-aws-sp-en.xml
index c1ba137e..c1ba137e 100644
--- a/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/at11.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/at11.ladok.umu.se-aws-sp.xml b/swamid-2.0/at11.ladok.umu.se-aws-sp.xml
index c25d80fd..c25d80fd 100644
--- a/nya-1.0/at11.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/at11.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/at11.ladok.umu.se-dw-idp.xml b/swamid-2.0/at11.ladok.umu.se-dw-idp.xml
index d8ab977f..d8ab977f 100644
--- a/swamid-1.0/at11.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/at11.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/at11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/at11.ladok.umu.se-ecs-idp.xml
index 259c96c3..259c96c3 100644
--- a/swamid-1.0/at11.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/at11.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/at11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/at11.ladok.umu.se-ecs-sp.xml
index ca3f4a43..ca3f4a43 100644
--- a/nya-1.0/at11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/at11.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml
index 88e5d569..88e5d569 100644
--- a/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/bardo.kib.ki.se-shibboleth.xml b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
index d6a2b49e..d6a2b49e 100644
--- a/swamid-1.0/bardo.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/beta.augustus.se.xml b/swamid-2.0/beta.augustus.se.xml
index 3c212f97..3c212f97 100644
--- a/swamid-1.0/beta.augustus.se.xml
+++ b/swamid-2.0/beta.augustus.se.xml
diff --git a/swamid-1.0/beta.kib.ki.se-shibboleth.xml b/swamid-2.0/beta.kib.ki.se-shibboleth.xml
index 7eae8315..7eae8315 100644
--- a/swamid-1.0/beta.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/beta.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/beta.lobber.se-shibboleth.xml b/swamid-2.0/beta.lobber.se-shibboleth.xml
index 6ce5b31b..6ce5b31b 100644
--- a/swamid-1.0/beta.lobber.se-shibboleth.xml
+++ b/swamid-2.0/beta.lobber.se-shibboleth.xml
diff --git a/swamid-1.0/betafoo.nordu.net-saml2-metadata.xml b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
index c44cf9ed..c44cf9ed 100644
--- a/swamid-1.0/betafoo.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
diff --git a/swamid-1.0/betafoo.nordu.net-shibboleth.xml b/swamid-2.0/betafoo.nordu.net-shibboleth.xml
index f8eff970..f8eff970 100644
--- a/swamid-1.0/betafoo.nordu.net-shibboleth.xml
+++ b/swamid-2.0/betafoo.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/bhb-00.its.umu.se-gui-sp.xml b/swamid-2.0/bhb-00.its.umu.se-gui-sp.xml
index 6bd66c65..6bd66c65 100644
--- a/swamid-1.0/bhb-00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/bhb-00.its.umu.se-gui-sp.xml
diff --git a/swamid-1.0/bhb-00.its.umu.se-user-idp.xml b/swamid-2.0/bhb-00.its.umu.se-user-idp.xml
index 306fb556..306fb556 100644
--- a/swamid-1.0/bhb-00.its.umu.se-user-idp.xml
+++ b/swamid-2.0/bhb-00.its.umu.se-user-idp.xml
diff --git a/swamid-1.0/bibliometrics.ki.se-shibboleth.xml b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
index 198ac5d4..198ac5d4 100644
--- a/swamid-1.0/bibliometrics.ki.se-shibboleth.xml
+++ b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
diff --git a/swamid-1.0/brainstorm.swami.se-shibboleth.xml b/swamid-2.0/brainstorm.swami.se-shibboleth.xml
index a9a69e42..a9a69e42 100644
--- a/swamid-1.0/brainstorm.swami.se-shibboleth.xml
+++ b/swamid-2.0/brainstorm.swami.se-shibboleth.xml
diff --git a/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml b/swamid-2.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
index e802d491..e802d491 100644
--- a/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
+++ b/swamid-2.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
diff --git a/swamid-1.0/cambro-test-26.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml
index e685e016..e685e016 100644
--- a/swamid-1.0/cambro-test-26.umdc.umu.se-shibboleth.xml
+++ b/swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/cambro-tst1.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml
index 3de6f7c2..3de6f7c2 100644
--- a/swamid-1.0/cambro-tst1.umdc.umu.se-shibboleth.xml
+++ b/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/cambro-utv1.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml
index 80da43fa..80da43fa 100644
--- a/swamid-1.0/cambro-utv1.umdc.umu.se-shibboleth.xml
+++ b/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/captivelan-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/captivelan-test.it.su.se-shibboleth.sso.xml
index 9e340309..9e340309 100644
--- a/swamid-1.0/captivelan-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/captivelan-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/captivelan.it.su.se-shibboleth.sso.xml b/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
index 63bc6c1b..63bc6c1b 100644
--- a/swamid-1.0/captivelan.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/cbs-vylvatest.kib.ki.se-shibboleth.xml b/swamid-2.0/cbs-vylvatest.kib.ki.se-shibboleth.xml
index b5f76502..b5f76502 100644
--- a/swamid-1.0/cbs-vylvatest.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/cbs-vylvatest.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/cdn.nordunet.tv-shibboleth.xml b/swamid-2.0/cdn.nordunet.tv-shibboleth.xml
index c63bdf02..c63bdf02 100644
--- a/swamid-1.0/cdn.nordunet.tv-shibboleth.xml
+++ b/swamid-2.0/cdn.nordunet.tv-shibboleth.xml
diff --git a/swamid-1.0/coip-test.sunet.se-idp-shibboleth.xml b/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml
index 1502477c..1502477c 100644
--- a/swamid-1.0/coip-test.sunet.se-idp-shibboleth.xml
+++ b/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml
diff --git a/swamid-1.0/coip-test.sunet.se-shibboleth.xml b/swamid-2.0/coip-test.sunet.se-shibboleth.xml
index 39b70c7c..39b70c7c 100644
--- a/swamid-1.0/coip-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/coip-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/confluence-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
index f5809cbd..f5809cbd 100644
--- a/swamid-1.0/confluence-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/confluence.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
index 1fcd5ab3..1fcd5ab3 100644
--- a/swamid-1.0/confluence.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index 762acbeb..762acbeb 100644
--- a/swamid-1.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect-stable.sunet.se-shibboleth.xml b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
index 476f4b44..476f4b44 100644
--- a/swamid-1.0/connect-stable.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect-test.sunet.se-shibboleth.xml b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
index 419b83d1..419b83d1 100644
--- a/swamid-1.0/connect-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml
index f934124e..f934124e 100644
--- a/swamid-1.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/connect.uninett.no-shibboleth.xml b/swamid-2.0/connect.uninett.no-shibboleth.xml
index db8b1dfe..db8b1dfe 100644
--- a/swamid-1.0/connect.uninett.no-shibboleth.xml
+++ b/swamid-2.0/connect.uninett.no-shibboleth.xml
diff --git a/swamid-1.0/converis.info-shibboleth.xml b/swamid-2.0/converis.info-shibboleth.xml
index f8ddc1cd..f8ddc1cd 100644
--- a/swamid-1.0/converis.info-shibboleth.xml
+++ b/swamid-2.0/converis.info-shibboleth.xml
diff --git a/swamid-1.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml
index 61aa7284..61aa7284 100644
--- a/swamid-1.0/crowd.nordu.net-shibboleth.xml
+++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/crowdtest.nordu.net-shibboleth.xml b/swamid-2.0/crowdtest.nordu.net-shibboleth.xml
index 89e41b23..89e41b23 100644
--- a/swamid-1.0/crowdtest.nordu.net-shibboleth.xml
+++ b/swamid-2.0/crowdtest.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/dedserv79.levonline.com-shibboleth.xml b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
index da8d9023..da8d9023 100644
--- a/swamid-1.0/dedserv79.levonline.com-shibboleth.xml
+++ b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
diff --git a/swamid-1.0/dev.lobber.se-shibboleth.xml b/swamid-2.0/dev.lobber.se-shibboleth.xml
index 93cdff13..93cdff13 100644
--- a/swamid-1.0/dev.lobber.se-shibboleth.xml
+++ b/swamid-2.0/dev.lobber.se-shibboleth.xml
diff --git a/swamid-1.0/download.portal.chalmers.se-shibboleth.xml b/swamid-2.0/download.portal.chalmers.se-shibboleth.xml
index 243718db..243718db 100644
--- a/swamid-1.0/download.portal.chalmers.se-shibboleth.xml
+++ b/swamid-2.0/download.portal.chalmers.se-shibboleth.xml
diff --git a/swamid-1.0/dspace.it.su.se.xml b/swamid-2.0/dspace.it.su.se.xml
index 66d762cd..66d762cd 100644
--- a/swamid-1.0/dspace.it.su.se.xml
+++ b/swamid-2.0/dspace.it.su.se.xml
diff --git a/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml b/swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml
index 983f1f33..983f1f33 100644
--- a/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml
+++ b/swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml
diff --git a/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml b/swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml
index a1d910bf..a1d910bf 100644
--- a/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml
+++ b/swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml
diff --git a/swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml b/swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml
index 00c674a1..00c674a1 100644
--- a/swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml
+++ b/swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml
diff --git a/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml b/swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml
index 1974a16a..1974a16a 100644
--- a/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml b/swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml
index b7898210..b7898210 100644
--- a/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml b/swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml
index 7549a2bb..7549a2bb 100644
--- a/swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml
+++ b/swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml
diff --git a/swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml b/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml
index 9e93cbf0..9e93cbf0 100644
--- a/swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml
+++ b/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml
diff --git a/swamid-1.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml b/swamid-2.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml
index b65392e9..b65392e9 100644
--- a/swamid-1.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml b/swamid-2.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml
index 8dd9a984..8dd9a984 100644
--- a/swamid-1.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml b/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml
index 496c1eba..496c1eba 100644
--- a/swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml
+++ b/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml
diff --git a/swamid-1.0/ensky.lhs.se-shibboleth.xml b/swamid-2.0/ensky.lhs.se-shibboleth.xml
index 5013ff4b..5013ff4b 100644
--- a/swamid-1.0/ensky.lhs.se-shibboleth.xml
+++ b/swamid-2.0/ensky.lhs.se-shibboleth.xml
diff --git a/swamid-1.0/epc.ub.uu.se-shibboleth.xml b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
index 02dbc635..02dbc635 100644
--- a/swamid-1.0/epc.ub.uu.se-shibboleth.xml
+++ b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
diff --git a/swamid-1.0/etenta.math.su.se b/swamid-2.0/etenta.math.su.se
index a41395a4..a41395a4 100644
--- a/swamid-1.0/etenta.math.su.se
+++ b/swamid-2.0/etenta.math.su.se
diff --git a/swamid-1.0/expert.antagning.se-ecs-sp.xml b/swamid-2.0/expert.antagning.se-ecs-sp.xml
index ca819908..ca819908 100644
--- a/swamid-1.0/expert.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.antagning.se-ecs-sp.xml
diff --git a/swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml b/swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml
index d7805d3d..d7805d3d 100644
--- a/swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml
+++ b/swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml
index d5cfe3a0..d5cfe3a0 100644
--- a/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml
diff --git a/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml
index e085bce8..e085bce8 100644
--- a/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml
diff --git a/swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml b/swamid-2.0/expert.testc.ladok.umu.se-ecs-sp.xml
index 8cd3e03d..8cd3e03d 100644
--- a/swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/expert.testc.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml b/swamid-2.0/expert.testd.ladok.umu.se-ecs-sp.xml
index 46991f08..46991f08 100644
--- a/swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/expert.testd.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index b7f3fe7a..b7f3fe7a 100644
--- a/swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
diff --git a/swamid-1.0/fordrop.irt.kth.se-shibboleth.xml b/swamid-2.0/fordrop.irt.kth.se-shibboleth.xml
index 47d16166..47d16166 100644
--- a/swamid-1.0/fordrop.irt.kth.se-shibboleth.xml
+++ b/swamid-2.0/fordrop.irt.kth.se-shibboleth.xml
diff --git a/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/ft11.ladok.umu.se-aws-sp-en.xml
index 8b87312e..8b87312e 100644
--- a/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/ft11.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/ft11.ladok.umu.se-aws-sp.xml b/swamid-2.0/ft11.ladok.umu.se-aws-sp.xml
index 1957324e..1957324e 100644
--- a/nya-1.0/ft11.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/ft11.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml b/swamid-2.0/ft11.ladok.umu.se-dw-idp.xml
index e6fb91ca..e6fb91ca 100644
--- a/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/ft11.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/ft11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/ft11.ladok.umu.se-ecs-idp.xml
index d8f952d3..d8f952d3 100644
--- a/swamid-1.0/ft11.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/ft11.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/ft11.ladok.umu.se-ecs-sp.xml
index cf15b9ea..cf15b9ea 100644
--- a/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/ft11.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml
index f62b0ea2..f62b0ea2 100644
--- a/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/gallus.scilifelab.se-shibboleth.xml b/swamid-2.0/gallus.scilifelab.se-shibboleth.xml
index d6d75751..d6d75751 100644
--- a/swamid-1.0/gallus.scilifelab.se-shibboleth.xml
+++ b/swamid-2.0/gallus.scilifelab.se-shibboleth.xml
diff --git a/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index 899fbfd5..899fbfd5 100644
--- a/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
diff --git a/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
index 33827785..33827785 100644
--- a/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
diff --git a/swamid-1.0/hr.su.se-shibboleth.xml b/swamid-2.0/hr.su.se-shibboleth.xml
index 57a544cb..57a544cb 100644
--- a/swamid-1.0/hr.su.se-shibboleth.xml
+++ b/swamid-2.0/hr.su.se-shibboleth.xml
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp-en.xml
index 115309ea..115309ea 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-aws-sp.xml b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml
index e5ad3a10..e5ad3a10 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml b/swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml
index 029e7d3f..029e7d3f 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-ecs-idp.xml b/swamid-2.0/hubbletest.ladok.umu.se-ecs-idp.xml
index a68f30e9..a68f30e9 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/hubbletest.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml b/swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml
index d7efa8e4..d7efa8e4 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
index 1d6fcb1e..1d6fcb1e 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/identity.mdh.se-idp-shibboleth.xml b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
index 8e0c043f..8e0c043f 100644
--- a/swamid-1.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp-fre-1.eduid.se-idp.xml b/swamid-2.0/idp-fre-1.eduid.se-idp.xml
index c0d390a5..c0d390a5 100644
--- a/swamid-1.0/idp-fre-1.eduid.se-idp.xml
+++ b/swamid-2.0/idp-fre-1.eduid.se-idp.xml
diff --git a/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml b/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml
index 35979cf6..35979cf6 100644
--- a/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
index d6687c6c..d6687c6c 100644
--- a/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index 2f295c0a..2f295c0a 100644
--- a/swamid-1.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
index df1df92d..df1df92d 100644
--- a/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
diff --git a/swamid-1.0/idp.hig.se-idp-shibboleth.xml b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
index 66dfc41d..66dfc41d 100644
--- a/swamid-1.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index 1db9a802..1db9a802 100644
--- a/swamid-1.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
index 58110b89..58110b89 100644
--- a/swamid-1.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index 595ca01a..595ca01a 100644
--- a/swamid-1.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
index ba57ad76..ba57ad76 100644
--- a/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
index 42aed87f..42aed87f 100644
--- a/swamid-1.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index 5bf46b5c..5bf46b5c 100644
--- a/swamid-1.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
index 9e2929f7..9e2929f7 100644
--- a/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
index 3f6ab92b..3f6ab92b 100644
--- a/swamid-1.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index a36807b7..a36807b7 100644
--- a/swamid-1.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
index 4482716b..4482716b 100644
--- a/swamid-1.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
index 3d91bc1d..3d91bc1d 100644
--- a/swamid-1.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
index 43dee78a..43dee78a 100644
--- a/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp.suni.se-adfs-services-trust.xml b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
index 7e227514..7e227514 100644
--- a/swamid-1.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
diff --git a/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index 43b94302..43b94302 100644
--- a/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
diff --git a/swamid-1.0/idp2.hig.se-idp-shibboleth.xml b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
index b67b614b..b67b614b 100644
--- a/swamid-1.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp2.hv.se-idp-shibboleth.xml b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
index 31953416..31953416 100644
--- a/swamid-1.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp2.kau.se-idp-shibboleth.xml b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
index d496f40b..d496f40b 100644
--- a/swamid-1.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idp3.hv.se-idp-shibboleth.xml b/swamid-2.0/idp3.hv.se-idp-shibboleth.xml
index 6f085338..6f085338 100644
--- a/swamid-1.0/idp3.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.hv.se-idp-shibboleth.xml
diff --git a/swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml
index 3c0c759e..3c0c759e 100644
--- a/swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/ilearn.dsv.su.se-shibboleth.xml b/swamid-2.0/ilearn.dsv.su.se-shibboleth.xml
index 4bfc76d3..4bfc76d3 100644
--- a/swamid-1.0/ilearn.dsv.su.se-shibboleth.xml
+++ b/swamid-2.0/ilearn.dsv.su.se-shibboleth.xml
diff --git a/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/it11.ladok.umu.se-aws-sp-en.xml
index 26cda097..26cda097 100644
--- a/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/it11.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/it11.ladok.umu.se-aws-sp.xml b/swamid-2.0/it11.ladok.umu.se-aws-sp.xml
index f1d546a0..f1d546a0 100644
--- a/nya-1.0/it11.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/it11.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/it11.ladok.umu.se-dw-idp.xml b/swamid-2.0/it11.ladok.umu.se-dw-idp.xml
index 94d942f8..94d942f8 100644
--- a/swamid-1.0/it11.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/it11.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/it11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/it11.ladok.umu.se-ecs-idp.xml
index 1881bb00..1881bb00 100644
--- a/swamid-1.0/it11.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/it11.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/it11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/it11.ladok.umu.se-ecs-sp.xml
index 68922e62..68922e62 100644
--- a/nya-1.0/it11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/it11.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml
index 82c11641..82c11641 100644
--- a/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/its-pd0001.ad.umu.se-shibboleth.xml b/swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml
index e2dfe2ed..e2dfe2ed 100644
--- a/swamid-1.0/its-pd0001.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/its-pd0030.ad.umu.se-shibboleth.xml b/swamid-2.0/its-pd0030.ad.umu.se-shibboleth.xml
index 95f0e529..95f0e529 100644
--- a/swamid-1.0/its-pd0030.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/its-pd0030.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/its-pd0062.ad.umu.se-shibboleth-sp.xml b/swamid-2.0/its-pd0062.ad.umu.se-shibboleth-sp.xml
index 87ea54c1..87ea54c1 100644
--- a/swamid-1.0/its-pd0062.ad.umu.se-shibboleth-sp.xml
+++ b/swamid-2.0/its-pd0062.ad.umu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/jabber.nordu.net-shibboleth.xml b/swamid-2.0/jabber.nordu.net-shibboleth.xml
index fb6c4bd0..fb6c4bd0 100644
--- a/swamid-1.0/jabber.nordu.net-shibboleth.xml
+++ b/swamid-2.0/jabber.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/jira-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
index 8449c4f4..8449c4f4 100644
--- a/swamid-1.0/jira-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/jira.it.su.se-shibboleth.sso.xml b/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
index e7527c99..e7527c99 100644
--- a/swamid-1.0/jira.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/kib.ki.se-shibboleth.xml b/swamid-2.0/kib.ki.se-shibboleth.xml
index baa4cbc8..baa4cbc8 100644
--- a/swamid-1.0/kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
index 715f62a5..715f62a5 100644
--- a/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
diff --git a/swamid-1.0/kilwdev.it.ki.se-shibboleth.xml b/swamid-2.0/kilwdev.it.ki.se-shibboleth.xml
index 69df0b77..69df0b77 100644
--- a/swamid-1.0/kilwdev.it.ki.se-shibboleth.xml
+++ b/swamid-2.0/kilwdev.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/kisetest2.user.ki.se-shibboleth.xml b/swamid-2.0/kisetest2.user.ki.se-shibboleth.xml
index 725fe618..725fe618 100644
--- a/swamid-1.0/kisetest2.user.ki.se-shibboleth.xml
+++ b/swamid-2.0/kisetest2.user.ki.se-shibboleth.xml
diff --git a/swamid-1.0/kurser.math.su.se-shibboleth.xml b/swamid-2.0/kurser.math.su.se-shibboleth.xml
index 39717c24..39717c24 100644
--- a/swamid-1.0/kurser.math.su.se-shibboleth.xml
+++ b/swamid-2.0/kurser.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/kurser3.math.su.se-shibboleth.xml b/swamid-2.0/kurser3.math.su.se-shibboleth.xml
index 25906657..25906657 100644
--- a/swamid-1.0/kurser3.math.su.se-shibboleth.xml
+++ b/swamid-2.0/kurser3.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/labs.swami.se.xml b/swamid-2.0/labs.swami.se.xml
index d61425a4..d61425a4 100644
--- a/swamid-1.0/labs.swami.se.xml
+++ b/swamid-2.0/labs.swami.se.xml
diff --git a/swamid-1.0/ladok-test.su.se-shibboleth.sso.xml b/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml
index d0b8e327..d0b8e327 100644
--- a/swamid-1.0/ladok-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/ladok.su.se-shibboleth.sso.xml b/swamid-2.0/ladok.su.se-shibboleth.sso.xml
index 02b43720..02b43720 100644
--- a/swamid-1.0/ladok.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/ladok.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml
index 94fb3d7f..94fb3d7f 100644
--- a/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-user-idp.xml
index f22f9be3..f22f9be3 100644
--- a/swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-user-idp.xml
index ef96321f..ef96321f 100644
--- a/swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-02.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-user-idp.xml
index 62ea17e2..62ea17e2 100644
--- a/swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-03.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-user-idp.xml
index 5585d686..5585d686 100644
--- a/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-04.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-user-idp.xml
index 2ac734c1..2ac734c1 100644
--- a/swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-05.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-user-idp.xml
index a54955e1..a54955e1 100644
--- a/swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-06.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-user-idp.xml
index 0d955ab1..0d955ab1 100644
--- a/swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-07.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-user-idp.xml
index 0287d0e5..0287d0e5 100644
--- a/swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-08.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-user-idp.xml
index ea0d2b0a..ea0d2b0a 100644
--- a/swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-09.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-user-idp.xml
index 0f17b6c7..0f17b6c7 100644
--- a/swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-10.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-user-idp.xml
index e18d0e38..e18d0e38 100644
--- a/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3-p00.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3.its.umu.se-user-idp.xml b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
index dec62a01..dec62a01 100644
--- a/swamid-1.0/ladok3.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
diff --git a/swamid-1.0/ladok3test.its.umu.se-user-idp.xml b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
index 5dcdd01c..5dcdd01c 100644
--- a/swamid-1.0/ladok3test.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
diff --git a/swamid-1.0/lingon.ladok.umu.se-8087-sp.xml b/swamid-2.0/lingon.ladok.umu.se-8087-sp.xml
index f0609c2e..f0609c2e 100644
--- a/swamid-1.0/lingon.ladok.umu.se-8087-sp.xml
+++ b/swamid-2.0/lingon.ladok.umu.se-8087-sp.xml
diff --git a/swamid-1.0/lists.su.se-shibboleth.xml b/swamid-2.0/lists.su.se-shibboleth.xml
index 7ef17e8c..7ef17e8c 100644
--- a/swamid-1.0/lists.su.se-shibboleth.xml
+++ b/swamid-2.0/lists.su.se-shibboleth.xml
diff --git a/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
index 754d3c51..754d3c51 100644
--- a/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml
+++ b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login-dev.du.se-idp-shibboleth.xml b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
index c71be766..c71be766 100644
--- a/swamid-1.0/login-dev.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml
index 97bdb37b..97bdb37b 100644
--- a/swamid-1.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.du.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login.liu.se-idp-shibboleth.xml b/swamid-2.0/login.liu.se-idp-shibboleth.xml
index 746fb3f4..746fb3f4 100644
--- a/swamid-1.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.liu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/login.proxy.kib.ki.se-shibboleth.xml b/swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml
index 25a15b18..25a15b18 100644
--- a/swamid-1.0/login.proxy.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/lpw.ki.se-shibboleth.xml b/swamid-2.0/lpw.ki.se-shibboleth.xml
index 4e9762b9..4e9762b9 100644
--- a/swamid-1.0/lpw.ki.se-shibboleth.xml
+++ b/swamid-2.0/lpw.ki.se-shibboleth.xml
diff --git a/swamid-1.0/lpwdev.it.ki.se-shibboleth.xml b/swamid-2.0/lpwdev.it.ki.se-shibboleth.xml
index 4397ce9e..4397ce9e 100644
--- a/swamid-1.0/lpwdev.it.ki.se-shibboleth.xml
+++ b/swamid-2.0/lpwdev.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/mail.su.se-shibboleth.sso.xml b/swamid-2.0/mail.su.se-shibboleth.sso.xml
index a866c60b..a866c60b 100644
--- a/swamid-1.0/mail.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mail.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/mailfilter-test.nordu.net-shibboleth.xml b/swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml
index 881c7d22..881c7d22 100644
--- a/swamid-1.0/mailfilter-test.nordu.net-shibboleth.xml
+++ b/swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/mailfilter.nordu.net-shibboleth.xml b/swamid-2.0/mailfilter.nordu.net-shibboleth.xml
index e4a7170e..e4a7170e 100644
--- a/swamid-1.0/mailfilter.nordu.net-shibboleth.xml
+++ b/swamid-2.0/mailfilter.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/mailfilter.sunet.se-shibboleth.xml b/swamid-2.0/mailfilter.sunet.se-shibboleth.xml
index ff9d9ece..ff9d9ece 100644
--- a/swamid-1.0/mailfilter.sunet.se-shibboleth.xml
+++ b/swamid-2.0/mailfilter.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/mds-test.sunet.se-shibboleth.xml b/swamid-2.0/mds-test.sunet.se-shibboleth.xml
index 24d9b2e0..24d9b2e0 100644
--- a/swamid-1.0/mds-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/mds-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/mds.lan.kth.se-shibboleth.xml b/swamid-2.0/mds.lan.kth.se-shibboleth.xml
index 9fc434af..9fc434af 100644
--- a/swamid-1.0/mds.lan.kth.se-shibboleth.xml
+++ b/swamid-2.0/mds.lan.kth.se-shibboleth.xml
diff --git a/swamid-1.0/mds.sunet.se-shibboleth.xml b/swamid-2.0/mds.sunet.se-shibboleth.xml
index 36d51012..36d51012 100644
--- a/swamid-1.0/mds.sunet.se-shibboleth.xml
+++ b/swamid-2.0/mds.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/mds2.nordu.net-shibboleth.xml b/swamid-2.0/mds2.nordu.net-shibboleth.xml
index 71f987ce..71f987ce 100644
--- a/swamid-1.0/mds2.nordu.net-shibboleth.xml
+++ b/swamid-2.0/mds2.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/meetingtools.nordu.net-shibboleth.xml b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
index dbbbc42a..dbbbc42a 100644
--- a/swamid-1.0/meetingtools.nordu.net-shibboleth.xml
+++ b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/meta.eduroam.se-shibboleth.xml b/swamid-2.0/meta.eduroam.se-shibboleth.xml
index c1ad7c52..c1ad7c52 100644
--- a/swamid-1.0/meta.eduroam.se-shibboleth.xml
+++ b/swamid-2.0/meta.eduroam.se-shibboleth.xml
diff --git a/swamid-1.0/minasidor.ladok.umu.se-shib-sp.xml b/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml
index 1d679ace..1d679ace 100644
--- a/swamid-1.0/minasidor.ladok.umu.se-shib-sp.xml
+++ b/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml
diff --git a/swamid-1.0/minastudier-test.su.se-shibboleth.sso.xml b/swamid-2.0/minastudier-test.su.se-shibboleth.sso.xml
index c05a7ad6..c05a7ad6 100644
--- a/swamid-1.0/minastudier-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/minastudier-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/minastudier.ladok.umu.se-user-idp.xml b/swamid-2.0/minastudier.ladok.umu.se-user-idp.xml
index b5c30e85..b5c30e85 100644
--- a/swamid-1.0/minastudier.ladok.umu.se-user-idp.xml
+++ b/swamid-2.0/minastudier.ladok.umu.se-user-idp.xml
diff --git a/swamid-1.0/minastudier.su.se-shibboleth.sso.xml b/swamid-2.0/minastudier.su.se-shibboleth.sso.xml
index f51430bf..f51430bf 100644
--- a/swamid-1.0/minastudier.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/minastudier.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index 70788502..70788502 100644
--- a/swamid-1.0/mondo-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/mondo-web.it.su.se-shibboleth.xml b/swamid-2.0/mondo-web.it.su.se-shibboleth.xml
index e6b83993..e6b83993 100644
--- a/swamid-1.0/mondo-web.it.su.se-shibboleth.xml
+++ b/swamid-2.0/mondo-web.it.su.se-shibboleth.xml
diff --git a/swamid-1.0/mondo.su.se-shibboleth.sso.xml b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
index 0e1c777c..0e1c777c 100644
--- a/swamid-1.0/mondo.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/monitor.it.su.se-shibboleth.sso.xml b/swamid-2.0/monitor.it.su.se-shibboleth.sso.xml
index ebaa10b0..ebaa10b0 100644
--- a/swamid-1.0/monitor.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/monitor.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/moodle.lhs.se-shibboleth.xml b/swamid-2.0/moodle.lhs.se-shibboleth.xml
index e920ab9d..e920ab9d 100644
--- a/swamid-1.0/moodle.lhs.se-shibboleth.xml
+++ b/swamid-2.0/moodle.lhs.se-shibboleth.xml
diff --git a/swamid-1.0/nacho.adm.gu.se-shibboleth.xml b/swamid-2.0/nacho.adm.gu.se-shibboleth.xml
index 62f3f0ce..62f3f0ce 100644
--- a/swamid-1.0/nacho.adm.gu.se-shibboleth.xml
+++ b/swamid-2.0/nacho.adm.gu.se-shibboleth.xml
diff --git a/swamid-1.0/nagios-vm.nordu.net-shibboleth.xml b/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml
index 0a4b9add..0a4b9add 100644
--- a/swamid-1.0/nagios-vm.nordu.net-shibboleth.xml
+++ b/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nagios.dev.it.su.se-shibboleth.sso.xml b/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml
index 57cf2f16..57cf2f16 100644
--- a/swamid-1.0/nagios.dev.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/nagios.nordu.net-shibboleth.xml b/swamid-2.0/nagios.nordu.net-shibboleth.xml
index e7240428..e7240428 100644
--- a/swamid-1.0/nagios.nordu.net-shibboleth.xml
+++ b/swamid-2.0/nagios.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nb11.ladok.umu.se-aws-sp-en.xml
index 8dfdff67..8dfdff67 100644
--- a/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nb11.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nb11.ladok.umu.se-aws-sp.xml b/swamid-2.0/nb11.ladok.umu.se-aws-sp.xml
index f1a87976..f1a87976 100644
--- a/nya-1.0/nb11.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nb11.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml b/swamid-2.0/nb11.ladok.umu.se-dw-idp.xml
index ff53b752..ff53b752 100644
--- a/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nb11.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nb11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nb11.ladok.umu.se-ecs-idp.xml
index 88c2f137..88c2f137 100644
--- a/swamid-1.0/nb11.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nb11.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nb11.ladok.umu.se-ecs-sp.xml
index acbb6de2..acbb6de2 100644
--- a/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nb11.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml
index ba980e1c..ba980e1c 100644
--- a/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
index eef0e705..eef0e705 100644
--- a/swamid-1.0/ni.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
diff --git a/swamid-1.0/ni.nordu.net-shibboleth.xml b/swamid-2.0/ni.nordu.net-shibboleth.xml
index e38b995b..e38b995b 100644
--- a/swamid-1.0/ni.nordu.net-shibboleth.xml
+++ b/swamid-2.0/ni.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nidev-consumer.nordu.net-saml2-metadata.xml b/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
index 723f7019..723f7019 100644
--- a/swamid-1.0/nidev-consumer.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
diff --git a/swamid-1.0/nordunet.tv-shibboleth.xml b/swamid-2.0/nordunet.tv-shibboleth.xml
index 16021d1e..16021d1e 100644
--- a/swamid-1.0/nordunet.tv-shibboleth.xml
+++ b/swamid-2.0/nordunet.tv-shibboleth.xml
diff --git a/swamid-1.0/nordushare-dev.nordu.net-shibboleth.xml b/swamid-2.0/nordushare-dev.nordu.net-shibboleth.xml
index ff509cd2..ff509cd2 100644
--- a/swamid-1.0/nordushare-dev.nordu.net-shibboleth.xml
+++ b/swamid-2.0/nordushare-dev.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml
index f4a7d1ae..f4a7d1ae 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-00.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-00.ladok.umu.se-aws-sp.xml
index fc5dc478..fc5dc478 100644
--- a/nya-1.0/nya-00.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-00.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml
index 3d482980..3d482980 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-00.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-00.ladok.umu.se-ecs-idp.xml
index ab4605ad..ab4605ad 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-00.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-00.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-00.ladok.umu.se-ecs-sp.xml
index 2b701611..2b701611 100644
--- a/nya-1.0/nya-00.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-00.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml
index 0d15f3eb..0d15f3eb 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml
index 47c3a710..47c3a710 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml
index 4a284184..4a284184 100644
--- a/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml
index 71092680..71092680 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-01.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml
index 3fd72a21..3fd72a21 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-01.ladok.umu.se-ecs-sp.xml
index cc4fba97..cc4fba97 100644
--- a/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-01.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml
index 65a38e0b..65a38e0b 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-02.ladok.umu.se-aws-sp-en.xml
index f61730a3..f61730a3 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-02.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-02.ladok.umu.se-aws-sp.xml
index 2aed647e..2aed647e 100644
--- a/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-02.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml
index 84360c8c..84360c8c 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-02.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml
index fbc50826..fbc50826 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-02.ladok.umu.se-ecs-sp.xml
index 90443ec0..90443ec0 100644
--- a/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-02.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml
index 22b5e760..22b5e760 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-03.ladok.umu.se-aws-sp-en.xml
index 9f28564f..9f28564f 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-03.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-03.ladok.umu.se-aws-sp.xml
index 44578932..44578932 100644
--- a/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-03.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml
index 0f6809fc..0f6809fc 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-03.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml
index d6664c62..d6664c62 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-03.ladok.umu.se-ecs-sp.xml
index e40a6b86..e40a6b86 100644
--- a/nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-03.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml
index 5f176115..5f176115 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-04.ladok.umu.se-aws-sp-en.xml
index cd5697c9..cd5697c9 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-04.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-04.ladok.umu.se-aws-sp.xml
index aaa93700..aaa93700 100644
--- a/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-04.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml
index ce726469..ce726469 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-04.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml
index 8d8a01c0..8d8a01c0 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-04.ladok.umu.se-ecs-sp.xml
index 962ba540..962ba540 100644
--- a/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-04.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml
index 25748ecd..25748ecd 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-05.ladok.umu.se-aws-sp-en.xml
index c520d13a..c520d13a 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-05.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-05.ladok.umu.se-aws-sp.xml
index f6c095af..f6c095af 100644
--- a/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-05.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml
index eb26a175..eb26a175 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-05.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml
index 52f87c27..52f87c27 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-05.ladok.umu.se-ecs-sp.xml
index 17f8cbb7..17f8cbb7 100644
--- a/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-05.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml
index 309251d1..309251d1 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-06.ladok.umu.se-aws-sp-en.xml
index a3a91c9a..a3a91c9a 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-06.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-06.ladok.umu.se-aws-sp.xml
index 44cffff7..44cffff7 100644
--- a/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-06.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml
index 82dbbbae..82dbbbae 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-06.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml
index bee57c00..bee57c00 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-06.ladok.umu.se-ecs-sp.xml
index 286c4e04..286c4e04 100644
--- a/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-06.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml
index da47100e..da47100e 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-07.ladok.umu.se-aws-sp-en.xml
index ec7d612b..ec7d612b 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-07.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-07.ladok.umu.se-aws-sp.xml
index 79032739..79032739 100644
--- a/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-07.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml
index 3deb4d8d..3deb4d8d 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-07.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml
index b687d390..b687d390 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-07.ladok.umu.se-ecs-sp.xml
index 7a1cee32..7a1cee32 100644
--- a/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-07.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml
index c0d1d0ab..c0d1d0ab 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-08.ladok.umu.se-aws-sp-en.xml
index ac145e33..ac145e33 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-08.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-08.ladok.umu.se-aws-sp.xml
index 529a49d0..529a49d0 100644
--- a/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-08.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml
index c4b32aac..c4b32aac 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-08.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml
index 67c90b03..67c90b03 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-08.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-08.ladok.umu.se-ecs-sp.xml
index 27e15db9..27e15db9 100644
--- a/nya-1.0/nya-08.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-08.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml
index 555c34b0..555c34b0 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml
index 7a8d5bcc..7a8d5bcc 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml
index fa86dcd0..fa86dcd0 100644
--- a/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml
index be72edeb..be72edeb 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-09.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml
index 6b421763..6b421763 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-09.ladok.umu.se-ecs-sp.xml
index 0651a2fa..0651a2fa 100644
--- a/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-09.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml
index 542e5188..542e5188 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-10.ladok.umu.se-aws-sp-en.xml
index e940ca6b..e940ca6b 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-10.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml
index 81b0b13c..81b0b13c 100644
--- a/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml
index 443299c4..443299c4 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-10.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml
index 620d568f..620d568f 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-10.ladok.umu.se-ecs-sp.xml
index 73ab1c34..73ab1c34 100644
--- a/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-10.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml
index f3be07af..f3be07af 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-11.ladok.umu.se-aws-sp-en.xml
index 735c61de..735c61de 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-11.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-11.ladok.umu.se-aws-sp.xml
index e69b1a92..e69b1a92 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-11.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml
index 0be5759b..0be5759b 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml
index 695c1680..695c1680 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-11.ladok.umu.se-ecs-sp.xml
index 1414b868..1414b868 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-11.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml
index cb295d43..cb295d43 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-12.ladok.umu.se-aws-sp-en.xml
index becb8eea..becb8eea 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-12.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml
index e5278d11..e5278d11 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml
index 6f05ac3d..6f05ac3d 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-12.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml
index d7b4fa91..d7b4fa91 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-12.ladok.umu.se-ecs-sp.xml
index 2f267ef7..2f267ef7 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-12.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml
index 0f5989ac..0f5989ac 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml
index 7264ae1b..7264ae1b 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-13.ladok.umu.se-aws-sp.xml
index b16e0c04..b16e0c04 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-13.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml
index 9e3a750a..9e3a750a 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-13.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml
index fba567b7..fba567b7 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-13.ladok.umu.se-ecs-sp.xml
index 9738112a..9738112a 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-13.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml
index 6930501f..6930501f 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-14.ladok.umu.se-aws-sp-en.xml
index d588a95b..d588a95b 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-14.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml
index 3bd694d1..3bd694d1 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml
index efd88005..efd88005 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-14.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml
index c21ad583..c21ad583 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-14.ladok.umu.se-ecs-sp.xml
index 0fe25e9f..0fe25e9f 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-14.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml
index a7343be9..a7343be9 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-15.ladok.umu.se-aws-sp-en.xml
index bca0532b..bca0532b 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-15.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-15.ladok.umu.se-aws-sp.xml
index 5d740f2d..5d740f2d 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-15.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml
index e5ea07a4..e5ea07a4 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-15.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml
index f353ac61..f353ac61 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-15.ladok.umu.se-ecs-sp.xml
index eada0c9a..eada0c9a 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-15.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml
index 919a3d48..919a3d48 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-16.ladok.umu.se-aws-sp-en.xml
index 83bbd9b1..83bbd9b1 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-16.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml
index 3a135d48..3a135d48 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml
index 8a691478..8a691478 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-16.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml
index d1e5538e..d1e5538e 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-16.ladok.umu.se-ecs-sp.xml
index f8782ec6..f8782ec6 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-16.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml
index 009efc5d..009efc5d 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-17.ladok.umu.se-aws-sp-en.xml
index d58f7ae2..d58f7ae2 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-17.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml
index a4758fe2..a4758fe2 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml
index f168e065..f168e065 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-17.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml
index e316d6d2..e316d6d2 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-17.ladok.umu.se-ecs-sp.xml
index 90fd8073..90fd8073 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-17.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml
index eeb72f8a..eeb72f8a 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-18.ladok.umu.se-aws-sp-en.xml
index cbdd7e9c..cbdd7e9c 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-18.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-18.ladok.umu.se-aws-sp.xml
index 68ee487c..68ee487c 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-18.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml
index 098f7092..098f7092 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-18.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml
index de4e0ca0..de4e0ca0 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-18.ladok.umu.se-ecs-sp.xml
index 23727b2e..23727b2e 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-18.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml
index f3e21ad9..f3e21ad9 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml
index b3ae0124..b3ae0124 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml
index 0cbe8a09..0cbe8a09 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml
index 9ca6263a..9ca6263a 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-19.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml
index a7c8e21d..a7c8e21d 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-19.ladok.umu.se-ecs-sp.xml
index 2c5b1277..2c5b1277 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-19.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml
index 9d244978..9d244978 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-20.ladok.umu.se-aws-sp-en.xml
index b0d2bcdb..b0d2bcdb 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-20.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-20.ladok.umu.se-aws-sp.xml
index 6abf91e1..6abf91e1 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-20.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml
index ef5731a2..ef5731a2 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-20.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml
index e418e8ab..e418e8ab 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml
index 74c64c1b..74c64c1b 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml
index bbc942ea..bbc942ea 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-21.ladok.umu.se-aws-sp-en.xml
index bd1b3ea5..bd1b3ea5 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-21.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml
index 46eed8b6..46eed8b6 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-21.ladok.umu.se-dw-idp.xml
index c6935f08..c6935f08 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-21.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-21.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml
index ee030233..ee030233 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-21.ladok.umu.se-ecs-sp.xml
index 0f92d667..0f92d667 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-21.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-21.ladok.umu.se-shibboleth-idp.xml
index 995ac27e..995ac27e 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-21.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-22.ladok.umu.se-aws-sp-en.xml
index 38d36a24..38d36a24 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-22.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-22.ladok.umu.se-aws-sp.xml
index 20437a0d..20437a0d 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-22.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-22.ladok.umu.se-dw-idp.xml
index 3672b473..3672b473 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-22.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-22.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml
index 9de23812..9de23812 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-22.ladok.umu.se-ecs-sp.xml
index d2813898..d2813898 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-22.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-22.ladok.umu.se-shibboleth-idp.xml
index 8f22e6dc..8f22e6dc 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-22.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-23.ladok.umu.se-aws-sp-en.xml
index 20ec6e3e..20ec6e3e 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-23.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml
index 4cc25cc3..4cc25cc3 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-23.ladok.umu.se-dw-idp.xml
index 6d80c904..6d80c904 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-23.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-23.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml
index 32ea3281..32ea3281 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-23.ladok.umu.se-ecs-sp.xml
index 1c463c84..1c463c84 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-23.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-23.ladok.umu.se-shibboleth-idp.xml
index 7dad989f..7dad989f 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-23.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-24.ladok.umu.se-aws-sp-en.xml
index 89a5ca03..89a5ca03 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-24.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-24.ladok.umu.se-aws-sp.xml
index b6a19173..b6a19173 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-24.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-24.ladok.umu.se-dw-idp.xml
index 74abbb77..74abbb77 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-24.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-24.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml
index 22a5dc6e..22a5dc6e 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml
index e1bee9b6..e1bee9b6 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-24.ladok.umu.se-shibboleth-idp.xml
index f301015e..f301015e 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-24.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-25.ladok.umu.se-aws-sp-en.xml
index b05db47f..b05db47f 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-25.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml
index 016ac579..016ac579 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-25.ladok.umu.se-dw-idp.xml
index 1deb921b..1deb921b 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-25.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-25.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml
index 53c1ca2a..53c1ca2a 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-25.ladok.umu.se-ecs-sp.xml
index 3d2ed26d..3d2ed26d 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-25.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-25.ladok.umu.se-shibboleth-idp.xml
index e0e39507..e0e39507 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-25.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml
index 49a81b31..49a81b31 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml
index a672c28d..a672c28d 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-26.ladok.umu.se-dw-idp.xml
index c766aed7..c766aed7 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-26.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-26.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml
index 97ae5712..97ae5712 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-26.ladok.umu.se-ecs-sp.xml
index 176bdb3e..176bdb3e 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-26.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-26.ladok.umu.se-shibboleth-idp.xml
index 3cf0584b..3cf0584b 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-26.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-27.ladok.umu.se-aws-sp-en.xml
index a6a12be3..a6a12be3 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-27.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-27.ladok.umu.se-aws-sp.xml
index 03f8a876..03f8a876 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-27.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-27.ladok.umu.se-dw-idp.xml
index 621891b4..621891b4 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-27.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-27.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml
index f68ce447..f68ce447 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-27.ladok.umu.se-ecs-sp.xml
index 7195e058..7195e058 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-27.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-27.ladok.umu.se-shibboleth-idp.xml
index f7cc99e5..f7cc99e5 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-27.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-28.ladok.umu.se-aws-sp-en.xml
index 7af09549..7af09549 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-28.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml
index f6cab3af..f6cab3af 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-28.ladok.umu.se-dw-idp.xml
index 7572d351..7572d351 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-28.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-28.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml
index a79d1a76..a79d1a76 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-28.ladok.umu.se-ecs-sp.xml
index c9937825..c9937825 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-28.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-28.ladok.umu.se-shibboleth-idp.xml
index 9f6b7fe0..9f6b7fe0 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-28.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-29.ladok.umu.se-aws-sp-en.xml
index 1805ce2b..1805ce2b 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-29.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-29.ladok.umu.se-aws-sp.xml
index 0aaab64d..0aaab64d 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-29.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-29.ladok.umu.se-dw-idp.xml
index e7807dbc..e7807dbc 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-29.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-29.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml
index c6772b2b..c6772b2b 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-29.ladok.umu.se-ecs-sp.xml
index 98ae6b27..98ae6b27 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-29.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-29.ladok.umu.se-shibboleth-idp.xml
index a9848f38..a9848f38 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-29.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-30.ladok.umu.se-aws-sp-en.xml
index 0e4cb7ee..0e4cb7ee 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-30.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml
index 804a19ff..804a19ff 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-30.ladok.umu.se-dw-idp.xml
index 537d8b0d..537d8b0d 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-30.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-30.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml
index dfa6db5c..dfa6db5c 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-30.ladok.umu.se-ecs-sp.xml
index 989c2995..989c2995 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-30.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-30.ladok.umu.se-shibboleth-idp.xml
index a40735f4..a40735f4 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-30.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-31.ladok.umu.se-aws-sp-en.xml
index 66c9148d..66c9148d 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-31.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml
index 061afb18..061afb18 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-31.ladok.umu.se-dw-idp.xml
index 0ac3af55..0ac3af55 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-31.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-31.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml
index 5dac7d1e..5dac7d1e 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-31.ladok.umu.se-ecs-sp.xml
index 5c9bcc90..5c9bcc90 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-31.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-31.ladok.umu.se-shibboleth-idp.xml
index 5904cfb0..5904cfb0 100644
--- a/swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-31.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-32.ladok.umu.se-aws-sp-en.xml
index f2e45f5d..f2e45f5d 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-32.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-32.ladok.umu.se-aws-sp.xml
index ab4aaa16..ab4aaa16 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-32.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-32.ladok.umu.se-dw-idp.xml
index ae2c459c..ae2c459c 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-32.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-32.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml
index eb9a0dda..eb9a0dda 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-32.ladok.umu.se-ecs-sp.xml
index 298a064e..298a064e 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-32.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-32.ladok.umu.se-shibboleth-idp.xml
index c3765bd5..c3765bd5 100644
--- a/swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-32.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-33.ladok.umu.se-aws-sp-en.xml
index 86d62981..86d62981 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-33.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-33.ladok.umu.se-aws-sp.xml
index 3f6042b4..3f6042b4 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-33.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-33.ladok.umu.se-dw-idp.xml
index d17b6251..d17b6251 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-33.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-33.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml
index 2eec9c15..2eec9c15 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-33.ladok.umu.se-ecs-sp.xml
index a597519d..a597519d 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-33.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-33.ladok.umu.se-shibboleth-idp.xml
index 2ac645f8..2ac645f8 100644
--- a/swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-33.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml
index 657bcd3d..657bcd3d 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml
index 4882534c..4882534c 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-34.ladok.umu.se-dw-idp.xml
index 8a36988a..8a36988a 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-34.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-34.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml
index d16e3d6f..d16e3d6f 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-34.ladok.umu.se-ecs-sp.xml
index 90482cc5..90482cc5 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-34.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-34.ladok.umu.se-shibboleth-idp.xml
index cef551b0..cef551b0 100644
--- a/swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-34.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml
index c1a5fb12..c1a5fb12 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-35.ladok.umu.se-aws-sp.xml
index 334b2f25..334b2f25 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-35.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-35.ladok.umu.se-dw-idp.xml
index b5562865..b5562865 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-35.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-35.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml
index 31759408..31759408 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-35.ladok.umu.se-ecs-sp.xml
index 093aff0c..093aff0c 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-35.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-35.ladok.umu.se-shibboleth-idp.xml
index daa47e4b..daa47e4b 100644
--- a/swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-35.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml
index aa60398e..aa60398e 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-36.ladok.umu.se-aws-sp.xml
index addb596b..addb596b 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-36.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-36.ladok.umu.se-dw-idp.xml
index 74210276..74210276 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-36.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-36.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml
index e6fe55e7..e6fe55e7 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-36.ladok.umu.se-ecs-sp.xml
index a4870290..a4870290 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-36.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-36.ladok.umu.se-shibboleth-idp.xml
index b7e871ea..b7e871ea 100644
--- a/swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-36.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-37.ladok.umu.se-aws-sp-en.xml
index 34ee0ba9..34ee0ba9 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-37.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-37.ladok.umu.se-aws-sp.xml
index 300f4573..300f4573 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-37.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-37.ladok.umu.se-dw-idp.xml
index f840f441..f840f441 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-37.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-37.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml
index 7737c49a..7737c49a 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-37.ladok.umu.se-ecs-sp.xml
index 27bf0dac..27bf0dac 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-37.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-37.ladok.umu.se-shibboleth-idp.xml
index 8210e204..8210e204 100644
--- a/swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-37.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-38.ladok.umu.se-aws-sp-en.xml
index 141d0493..141d0493 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-38.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-38.ladok.umu.se-aws-sp.xml
index 03af1d80..03af1d80 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-38.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-38.ladok.umu.se-dw-idp.xml
index c013dfa9..c013dfa9 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-38.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-38.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml
index ea5ec30a..ea5ec30a 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-38.ladok.umu.se-ecs-sp.xml
index 188c787f..188c787f 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-38.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-38.ladok.umu.se-shibboleth-idp.xml
index f45c1d75..f45c1d75 100644
--- a/swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-38.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-39.ladok.umu.se-aws-sp-en.xml
index fafa6ac3..fafa6ac3 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-39.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-39.ladok.umu.se-aws-sp.xml
index dc7a105b..dc7a105b 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-39.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-39.ladok.umu.se-dw-idp.xml
index 86be0a83..86be0a83 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-39.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-39.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml
index c3d3139a..c3d3139a 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-39.ladok.umu.se-ecs-sp.xml
index 817a216c..817a216c 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-39.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-39.ladok.umu.se-shibboleth-idp.xml
index 7a237352..7a237352 100644
--- a/swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-39.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml
index a7ece519..a7ece519 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-40.ladok.umu.se-aws-sp.xml
index 08a8c570..08a8c570 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-40.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-40.ladok.umu.se-dw-idp.xml
index 0e288dae..0e288dae 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-40.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-40.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml
index 01fda788..01fda788 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml
index ef2fa310..ef2fa310 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-40.ladok.umu.se-shibboleth-idp.xml
index c90cc3c2..c90cc3c2 100644
--- a/swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-40.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-41.ladok.umu.se-aws-sp-en.xml
index 670e9fdf..670e9fdf 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-41.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-41.ladok.umu.se-aws-sp.xml
index 90bb7202..90bb7202 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-41.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-41.ladok.umu.se-dw-idp.xml
index 25e031e5..25e031e5 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-41.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-41.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml
index 0b1b1f52..0b1b1f52 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-41.ladok.umu.se-ecs-sp.xml
index 1a1795b0..1a1795b0 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-41.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-41.ladok.umu.se-shibboleth-idp.xml
index 0ee46e7b..0ee46e7b 100644
--- a/swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-41.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-42.ladok.umu.se-aws-sp-en.xml
index ccfade14..ccfade14 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-42.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-42.ladok.umu.se-aws-sp.xml
index 3a71be4e..3a71be4e 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-42.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-42.ladok.umu.se-dw-idp.xml
index 72678476..72678476 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-42.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-42.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml
index e642cb46..e642cb46 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-42.ladok.umu.se-ecs-sp.xml
index adb6d4d7..adb6d4d7 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-42.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-42.ladok.umu.se-shibboleth-idp.xml
index 0cb12f5e..0cb12f5e 100644
--- a/swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-42.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-43.ladok.umu.se-aws-sp-en.xml
index c379faa1..c379faa1 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-43.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-43.ladok.umu.se-aws-sp.xml
index aa06d2b1..aa06d2b1 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-43.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-43.ladok.umu.se-dw-idp.xml
index 5f8a0a23..5f8a0a23 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-43.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-43.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml
index 76aa8a57..76aa8a57 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-43.ladok.umu.se-ecs-sp.xml
index 3ea0c913..3ea0c913 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-43.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-43.ladok.umu.se-shibboleth-idp.xml
index c54a0152..c54a0152 100644
--- a/swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-43.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-44.ladok.umu.se-aws-sp-en.xml
index 17682d47..17682d47 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-44.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-44.ladok.umu.se-aws-sp.xml
index 3ec1e6ea..3ec1e6ea 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-44.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-44.ladok.umu.se-dw-idp.xml
index 315db662..315db662 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-44.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-44.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml
index 3219b227..3219b227 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-44.ladok.umu.se-ecs-sp.xml
index e4dafaa7..e4dafaa7 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-44.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-44.ladok.umu.se-shibboleth-idp.xml
index 679d54fa..679d54fa 100644
--- a/swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-44.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-45.ladok.umu.se-aws-sp-en.xml
index fe19bf30..fe19bf30 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-45.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-45.ladok.umu.se-aws-sp.xml
index ffaf19ee..ffaf19ee 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-45.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-45.ladok.umu.se-dw-idp.xml
index 1a05758a..1a05758a 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-45.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-45.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml
index b74efc3a..b74efc3a 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-45.ladok.umu.se-ecs-sp.xml
index 237e5a37..237e5a37 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-45.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-45.ladok.umu.se-shibboleth-idp.xml
index 75973fe7..75973fe7 100644
--- a/swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-45.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-46.ladok.umu.se-aws-sp-en.xml
index 7aa49000..7aa49000 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-46.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-46.ladok.umu.se-aws-sp.xml
index ff720d21..ff720d21 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-46.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-46.ladok.umu.se-dw-idp.xml
index 6c8361ab..6c8361ab 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-46.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-46.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml
index a9b45f36..a9b45f36 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-46.ladok.umu.se-ecs-sp.xml
index f8db382a..f8db382a 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-46.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-46.ladok.umu.se-shibboleth-idp.xml
index 5d231eb2..5d231eb2 100644
--- a/swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-46.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-47.ladok.umu.se-aws-sp-en.xml
index 07399a72..07399a72 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-47.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-47.ladok.umu.se-aws-sp.xml
index 97d417cd..97d417cd 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-47.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-47.ladok.umu.se-dw-idp.xml
index ef0d559f..ef0d559f 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-47.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-47.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml
index f01eb53c..f01eb53c 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-47.ladok.umu.se-ecs-sp.xml
index 4751d04b..4751d04b 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-47.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-47.ladok.umu.se-shibboleth-idp.xml
index 87bb4da7..87bb4da7 100644
--- a/swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-47.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml
index e5662104..e5662104 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-48.ladok.umu.se-aws-sp.xml
index bb8349b0..bb8349b0 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-48.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-48.ladok.umu.se-dw-idp.xml
index de8bb02d..de8bb02d 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-48.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-48.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml
index 44f92390..44f92390 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-48.ladok.umu.se-ecs-sp.xml
index 82f13363..82f13363 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-48.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-48.ladok.umu.se-shibboleth-idp.xml
index 9ff9a772..9ff9a772 100644
--- a/swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-48.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-49.ladok.umu.se-aws-sp-en.xml
index a23a8ca9..a23a8ca9 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-49.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-49.ladok.umu.se-aws-sp.xml
index 4b67f8c8..4b67f8c8 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-49.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-49.ladok.umu.se-dw-idp.xml
index ca21ec68..ca21ec68 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-49.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-49.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml
index d86fc0f2..d86fc0f2 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-49.ladok.umu.se-ecs-sp.xml
index 30d0368d..30d0368d 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-49.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-49.ladok.umu.se-shibboleth-idp.xml
index d949ab96..d949ab96 100644
--- a/swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-49.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml
index 440a3bae..440a3bae 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-50.ladok.umu.se-aws-sp.xml
index 89c83e2c..89c83e2c 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/nya-50.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-50.ladok.umu.se-dw-idp.xml
index 0df7d36a..0df7d36a 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/nya-50.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/nya-50.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml
index 7b59dbf1..7b59dbf1 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-50.ladok.umu.se-ecs-sp.xml
index 9ef842fc..9ef842fc 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/nya-50.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-50.ladok.umu.se-shibboleth-idp.xml
index c9a16ebb..c9a16ebb 100644
--- a/swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/nya-50.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml
index bd905ffa..bd905ffa 100644
--- a/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml
+++ b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml
diff --git a/swamid-1.0/nyautb.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nyautb.ladok.umu.se-ecs-idp.xml
index 5bc645a9..5bc645a9 100644
--- a/swamid-1.0/nyautb.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/nyautb.ladok.umu.se-ecs-idp.xml
diff --git a/swamid-1.0/openidp.feide.no.xml b/swamid-2.0/openidp.feide.no.xml
index 2762f30f..2762f30f 100644
--- a/swamid-1.0/openidp.feide.no.xml
+++ b/swamid-2.0/openidp.feide.no.xml
diff --git a/swamid-1.0/order.kib.ki.se-shibboleth.xml b/swamid-2.0/order.kib.ki.se-shibboleth.xml
index 9ad9a2d1..9ad9a2d1 100644
--- a/swamid-1.0/order.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/order.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/pingpong.chalmers.se-shibboleth.xml b/swamid-2.0/pingpong.chalmers.se-shibboleth.xml
index 9343f0f5..9343f0f5 100644
--- a/swamid-1.0/pingpong.chalmers.se-shibboleth.xml
+++ b/swamid-2.0/pingpong.chalmers.se-shibboleth.xml
diff --git a/swamid-1.0/play.hb.se-shibboleth.xml b/swamid-2.0/play.hb.se-shibboleth.xml
index d12455d2..d12455d2 100644
--- a/swamid-1.0/play.hb.se-shibboleth.xml
+++ b/swamid-2.0/play.hb.se-shibboleth.xml
diff --git a/swamid-1.0/play.hig.se-shibboleth.xml b/swamid-2.0/play.hig.se-shibboleth.xml
index 27ca7f8b..27ca7f8b 100644
--- a/swamid-1.0/play.hig.se-shibboleth.xml
+++ b/swamid-2.0/play.hig.se-shibboleth.xml
diff --git a/swamid-1.0/play.liu.se-shibboleth.xml b/swamid-2.0/play.liu.se-shibboleth.xml
index e9d5fb58..e9d5fb58 100644
--- a/swamid-1.0/play.liu.se-shibboleth.xml
+++ b/swamid-2.0/play.liu.se-shibboleth.xml
diff --git a/swamid-1.0/play.lu.se-shibboleth.xml b/swamid-2.0/play.lu.se-shibboleth.xml
index 4e442228..4e442228 100644
--- a/swamid-1.0/play.lu.se-shibboleth.xml
+++ b/swamid-2.0/play.lu.se-shibboleth.xml
diff --git a/swamid-1.0/play.mah.se-shibboleth.xml b/swamid-2.0/play.mah.se-shibboleth.xml
index 56f2e63c..56f2e63c 100644
--- a/swamid-1.0/play.mah.se-shibboleth.xml
+++ b/swamid-2.0/play.mah.se-shibboleth.xml
diff --git a/swamid-1.0/play.mdh.se-shibboleth.xml b/swamid-2.0/play.mdh.se-shibboleth.xml
index 9028fbe8..9028fbe8 100644
--- a/swamid-1.0/play.mdh.se-shibboleth.xml
+++ b/swamid-2.0/play.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/play.sunet.se-shibboleth.xml b/swamid-2.0/play.sunet.se-shibboleth.xml
index e8e303fd..e8e303fd 100644
--- a/swamid-1.0/play.sunet.se-shibboleth.xml
+++ b/swamid-2.0/play.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/portal.mdh.se-shibboleth.xml b/swamid-2.0/portal.mdh.se-shibboleth.xml
index b79db3f5..b79db3f5 100644
--- a/swamid-1.0/portal.mdh.se-shibboleth.xml
+++ b/swamid-2.0/portal.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/portalservicesutv.miun.se-shibboleth.xml b/swamid-2.0/portalservicesutv.miun.se-shibboleth.xml
index d08258ce..d08258ce 100644
--- a/swamid-1.0/portalservicesutv.miun.se-shibboleth.xml
+++ b/swamid-2.0/portalservicesutv.miun.se-shibboleth.xml
diff --git a/swamid-1.0/pp-edu-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-edu-admin.it.su.se-shibboleth.sso.xml
index be5686c3..be5686c3 100644
--- a/swamid-1.0/pp-edu-admin.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/pp-edu-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-komm-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
index 6b78cb29..6b78cb29 100644
--- a/swamid-1.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-migr-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
index d1adc98f..d1adc98f 100644
--- a/swamid-1.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-prod-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-prod-admin.it.su.se-shibboleth.sso.xml
index a6e73eb9..a6e73eb9 100644
--- a/swamid-1.0/pp-prod-admin.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/pp-prod-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
index 46cff006..46cff006 100644
--- a/swamid-1.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
index cccf6b89..cccf6b89 100644
--- a/swamid-1.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/pp-test-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-test-admin.it.su.se-shibboleth.sso.xml
index 0a1ae3f8..0a1ae3f8 100644
--- a/swamid-1.0/pp-test-admin.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/pp-test-admin.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/public.it.secure.su.se-shibboleth.xml b/swamid-2.0/public.it.secure.su.se-shibboleth.xml
index f5eb39e0..f5eb39e0 100644
--- a/swamid-1.0/public.it.secure.su.se-shibboleth.xml
+++ b/swamid-2.0/public.it.secure.su.se-shibboleth.xml
diff --git a/swamid-1.0/publications.ki.se-shibboleth.xml b/swamid-2.0/publications.ki.se-shibboleth.xml
index 8ac9eb7e..8ac9eb7e 100644
--- a/swamid-1.0/publications.ki.se-shibboleth.xml
+++ b/swamid-2.0/publications.ki.se-shibboleth.xml
diff --git a/swamid-1.0/referens-idp.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
index 133451ce..133451ce 100644
--- a/swamid-1.0/referens-idp.skolfederation.se-idp-shibboleth.xml
+++ b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
diff --git a/swamid-1.0/registrera.hb.se-shibboleth.xml b/swamid-2.0/registrera.hb.se-shibboleth.xml
index 8e093258..8e093258 100644
--- a/swamid-1.0/registrera.hb.se-shibboleth.xml
+++ b/swamid-2.0/registrera.hb.se-shibboleth.xml
diff --git a/swamid-1.0/rt-test-app1.it.su.se-shibboleth.sso.xml b/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml
index ed73abca..ed73abca 100644
--- a/swamid-1.0/rt-test-app1.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/rt.it.su.se-shibboleth.sso.xml b/swamid-2.0/rt.it.su.se-shibboleth.sso.xml
index 3264276f..3264276f 100644
--- a/swamid-1.0/rt.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/rt.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/samadhi.kib.ki.se-shibboleth.xml b/swamid-2.0/samadhi.kib.ki.se-shibboleth.xml
index be12eac0..be12eac0 100644
--- a/swamid-1.0/samadhi.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/samadhi.kib.ki.se-shibboleth.xml
diff --git a/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
index b4a2e0bb..b4a2e0bb 100644
--- a/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/samsok.libris.kb.se-shibboleth.xml b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
index d5e9866c..d5e9866c 100644
--- a/swamid-1.0/samsok.libris.kb.se-shibboleth.xml
+++ b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
diff --git a/swamid-1.0/selfservice.test.hb.se-shibboleth.xml b/swamid-2.0/selfservice.test.hb.se-shibboleth.xml
index 13ef1885..13ef1885 100644
--- a/swamid-1.0/selfservice.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.test.hb.se-shibboleth.xml
diff --git a/swamid-1.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
index 7e5219c2..7e5219c2 100644
--- a/swamid-1.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index d07c32fe..d07c32fe 100644
--- a/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shib-idp-test.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
index fbbe4fd5..fbbe4fd5 100644
--- a/swamid-1.0/shib-idp-test.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shib-sp.kau.se-shibboleth.xml b/swamid-2.0/shib-sp.kau.se-shibboleth.xml
index aa036934..aa036934 100644
--- a/swamid-1.0/shib-sp.kau.se-shibboleth.xml
+++ b/swamid-2.0/shib-sp.kau.se-shibboleth.xml
diff --git a/swamid-1.0/shib1.oru.se-shibboleth.xml b/swamid-2.0/shib1.oru.se-shibboleth.xml
index cc778e2c..cc778e2c 100644
--- a/swamid-1.0/shib1.oru.se-shibboleth.xml
+++ b/swamid-2.0/shib1.oru.se-shibboleth.xml
diff --git a/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
index d134db49..d134db49 100644
--- a/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibbo-test.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml
index 0957b877..0957b877 100644
--- a/swamid-1.0/shibbo-test.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 1ff4fbe1..1ff4fbe1 100644
--- a/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
diff --git a/nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml
index 5e19e010..5e19e010 100644
--- a/nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml
+++ b/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml
diff --git a/swamid-1.0/shibboleth.ebscohost.com.xml b/swamid-2.0/shibboleth.ebscohost.com.xml
index b0a85eed..b0a85eed 100644
--- a/swamid-1.0/shibboleth.ebscohost.com.xml
+++ b/swamid-2.0/shibboleth.ebscohost.com.xml
diff --git a/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
index a4bfa328..a4bfa328 100644
--- a/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
index c71a209a..c71a209a 100644
--- a/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.slu.se-idp-shibboleth.xml
index 660e76dc..660e76dc 100644
--- a/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.slu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
index b5d9dca1..b5d9dca1 100644
--- a/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
+++ b/swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
diff --git a/swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
index 5b257d92..5b257d92 100644
--- a/swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
+++ b/swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
diff --git a/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
index 473139e0..473139e0 100644
--- a/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
index 9d8f551c..9d8f551c 100644
--- a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.vhs.se-idp-shibboleth.xml
index ded571fb..ded571fb 100644
--- a/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.vhs.se-idp-shibboleth.xml
diff --git a/swamid-1.0/sigma-test-localhost-sp-130705.xml b/swamid-2.0/sigma-test-localhost-sp-130705.xml
index 43f49279..43f49279 100644
--- a/swamid-1.0/sigma-test-localhost-sp-130705.xml
+++ b/swamid-2.0/sigma-test-localhost-sp-130705.xml
diff --git a/swamid-1.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
index 6496746f..6496746f 100644
--- a/swamid-1.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml b/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
index af47477f..af47477f 100644
--- a/swamid-1.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
+++ b/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
diff --git a/swamid-1.0/smd-dev.nordu.net-shibboleth.xml b/swamid-2.0/smd-dev.nordu.net-shibboleth.xml
index bcdff661..bcdff661 100644
--- a/swamid-1.0/smd-dev.nordu.net-shibboleth.xml
+++ b/swamid-2.0/smd-dev.nordu.net-shibboleth.xml
diff --git a/swamid-1.0/smd.du.se-shibboleth.xml b/swamid-2.0/smd.du.se-shibboleth.xml
index d7680946..d7680946 100644
--- a/swamid-1.0/smd.du.se-shibboleth.xml
+++ b/swamid-2.0/smd.du.se-shibboleth.xml
diff --git a/swamid-1.0/smultron.catalogix.se-8090-sp.xml b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
index 8aa7b26b..8aa7b26b 100644
--- a/swamid-1.0/smultron.catalogix.se-8090-sp.xml
+++ b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
diff --git a/swamid-1.0/sp-nya.bth.se-shibboleth.xml b/swamid-2.0/sp-nya.bth.se-shibboleth.xml
index c255eb20..c255eb20 100644
--- a/swamid-1.0/sp-nya.bth.se-shibboleth.xml
+++ b/swamid-2.0/sp-nya.bth.se-shibboleth.xml
diff --git a/swamid-1.0/sp-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
index 1889db83..1889db83 100644
--- a/swamid-1.0/sp-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/sp-test.swamid.se-shibboleth.xml b/swamid-2.0/sp-test.swamid.se-shibboleth.xml
index 120eb1ca..120eb1ca 100644
--- a/swamid-1.0/sp-test.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sp-test.swamid.se-shibboleth.xml
diff --git a/swamid-1.0/sp.it.gu.se-shibboleth.xml b/swamid-2.0/sp.it.gu.se-shibboleth.xml
index 09637b34..09637b34 100644
--- a/swamid-1.0/sp.it.gu.se-shibboleth.xml
+++ b/swamid-2.0/sp.it.gu.se-shibboleth.xml
diff --git a/swamid-1.0/sp.kau.se-shibboleth.xml b/swamid-2.0/sp.kau.se-shibboleth.xml
index 71d0e69a..71d0e69a 100644
--- a/swamid-1.0/sp.kau.se-shibboleth.xml
+++ b/swamid-2.0/sp.kau.se-shibboleth.xml
diff --git a/swamid-1.0/sp.lhs.se-shibboleth.xml b/swamid-2.0/sp.lhs.se-shibboleth.xml
index e5fd511c..e5fd511c 100644
--- a/swamid-1.0/sp.lhs.se-shibboleth.xml
+++ b/swamid-2.0/sp.lhs.se-shibboleth.xml
diff --git a/swamid-1.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml
index 6a5be909..6a5be909 100644
--- a/swamid-1.0/sp.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sp.swamid.se-shibboleth.xml
diff --git a/swamid-1.0/sp.tools.sunet.se-shibboleth.xml b/swamid-2.0/sp.tools.sunet.se-shibboleth.xml
index 7481a0e9..7481a0e9 100644
--- a/swamid-1.0/sp.tools.sunet.se-shibboleth.xml
+++ b/swamid-2.0/sp.tools.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/sp.wavelan.su.se-shibboleth.sso.xml b/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
index f067f0d1..f067f0d1 100644
--- a/swamid-1.0/sp.wavelan.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/su.avedas.com-shibboleth.xml b/swamid-2.0/su.avedas.com-shibboleth.xml
index 6b5f752a..6b5f752a 100644
--- a/swamid-1.0/su.avedas.com-shibboleth.xml
+++ b/swamid-2.0/su.avedas.com-shibboleth.xml
diff --git a/swamid-1.0/sutest.dsv.su.se-shibboleth.xml b/swamid-2.0/sutest.dsv.su.se-shibboleth.xml
index 7f9ef5cc..7f9ef5cc 100644
--- a/swamid-1.0/sutest.dsv.su.se-shibboleth.xml
+++ b/swamid-2.0/sutest.dsv.su.se-shibboleth.xml
diff --git a/swamid-1.0/swamid.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid.shh.se-idp-shibboleth.xml
index 48893bf0..48893bf0 100644
--- a/swamid-1.0/swamid.shh.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid.shh.se-idp-shibboleth.xml
diff --git a/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml b/swamid-2.0/swamid.user.uu.se-idp-shibboleth.xml
index d4ebc529..d4ebc529 100644
--- a/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid.user.uu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 0f786a7a..0f786a7a 100644
--- a/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 98a65222..98a65222 100644
--- a/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 32e5b1b0..32e5b1b0 100644
--- a/swamid-1.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index a29adacf..a29adacf 100644
--- a/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-1.0/tcs-test.sunet.se-shibboleth.xml b/swamid-2.0/tcs-test.sunet.se-shibboleth.xml
index 00b31eee..00b31eee 100644
--- a/swamid-1.0/tcs-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/tcs-test.sunet.se-shibboleth.xml
diff --git a/swamid-1.0/test-chalmers.pingpong.net-shibboleth.xml b/swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml
index 62ff68b1..62ff68b1 100644
--- a/swamid-1.0/test-chalmers.pingpong.net-shibboleth.xml
+++ b/swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml
diff --git a/swamid-1.0/test-ki.pingpong.net-shibboleth.xml b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
index 90145007..90145007 100644
--- a/swamid-1.0/test-ki.pingpong.net-shibboleth.xml
+++ b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
diff --git a/swamid-1.0/testakt.it.ki.se-shibboleth.xml b/swamid-2.0/testakt.it.ki.se-shibboleth.xml
index 86718c94..86718c94 100644
--- a/swamid-1.0/testakt.it.ki.se-shibboleth.xml
+++ b/swamid-2.0/testakt.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/testgag.it.ki.se-shibboleth.xml b/swamid-2.0/testgag.it.ki.se-shibboleth.xml
index fdba6a7f..fdba6a7f 100644
--- a/swamid-1.0/testgag.it.ki.se-shibboleth.xml
+++ b/swamid-2.0/testgag.it.ki.se-shibboleth.xml
diff --git a/swamid-1.0/testshib.user.uu.se-idp-shibboleth.xml b/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
index cbbc8e9a..cbbc8e9a 100644
--- a/swamid-1.0/testshib.user.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
diff --git a/swamid-1.0/umdac-humpdac.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
index ba75f112..ba75f112 100644
--- a/swamid-1.0/umdac-humpdac.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-olho0001.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml
index 40fbb8f7..40fbb8f7 100644
--- a/swamid-1.0/umdac-olho0001.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml b/swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml
index 498f5073..498f5073 100644
--- a/swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml
index 68cf435b..68cf435b 100644
--- a/swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml
index fdbc3e08..fdbc3e08 100644
--- a/swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml
index fc48ea0a..fc48ea0a 100644
--- a/swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml
diff --git a/swamid-1.0/unitcf.se-shibboleth.xml b/swamid-2.0/unitcf.se-shibboleth.xml
index ade8042c..ade8042c 100644
--- a/swamid-1.0/unitcf.se-shibboleth.xml
+++ b/swamid-2.0/unitcf.se-shibboleth.xml
diff --git a/swamid-1.0/uu.test.diva-portal.org-shibboleth.xml b/swamid-2.0/uu.test.diva-portal.org-shibboleth.xml
index 82d0f335..82d0f335 100644
--- a/swamid-1.0/uu.test.diva-portal.org-shibboleth.xml
+++ b/swamid-2.0/uu.test.diva-portal.org-shibboleth.xml
diff --git a/swamid-1.0/vfu-gemdev.it.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
index d231518f..d231518f 100644
--- a/swamid-1.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/vfu-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
index ee07ba22..ee07ba22 100644
--- a/swamid-1.0/vfu-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
diff --git a/swamid-1.0/vfu.su.se-shibboleth.sso.xml b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
index 301bbfc0..301bbfc0 100644
--- a/swamid-1.0/vfu.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
diff --git a/nya-1.0/vhs-dev01.dyndns.org-shibboleth-sp.xml b/swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml
index 221c6c75..221c6c75 100644
--- a/nya-1.0/vhs-dev01.dyndns.org-shibboleth-sp.xml
+++ b/swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml
diff --git a/swamid-1.0/vlab-chemsub.explizit.se-shibboleth.xml b/swamid-2.0/vlab-chemsub.explizit.se-shibboleth.xml
index 013f4b5b..013f4b5b 100644
--- a/swamid-1.0/vlab-chemsub.explizit.se-shibboleth.xml
+++ b/swamid-2.0/vlab-chemsub.explizit.se-shibboleth.xml
diff --git a/swamid-1.0/vmfront.lan.kth.se-shibboleth.xml b/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml
index 52a45a3e..52a45a3e 100644
--- a/swamid-1.0/vmfront.lan.kth.se-shibboleth.xml
+++ b/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml
diff --git a/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 1cbd7e2a..1cbd7e2a 100644
--- a/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
diff --git a/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/wb11.ladok.umu.se-aws-sp-en.xml
index 9217fd58..9217fd58 100644
--- a/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/wb11.ladok.umu.se-aws-sp-en.xml
diff --git a/nya-1.0/wb11.ladok.umu.se-aws-sp.xml b/swamid-2.0/wb11.ladok.umu.se-aws-sp.xml
index 867b32b2..867b32b2 100644
--- a/nya-1.0/wb11.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/wb11.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml b/swamid-2.0/wb11.ladok.umu.se-dw-idp.xml
index 97d72433..97d72433 100644
--- a/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml
+++ b/swamid-2.0/wb11.ladok.umu.se-dw-idp.xml
diff --git a/swamid-1.0/wb11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/wb11.ladok.umu.se-ecs-idp.xml
index aa8eedf7..aa8eedf7 100644
--- a/swamid-1.0/wb11.ladok.umu.se-ecs-idp.xml
+++ b/swamid-2.0/wb11.ladok.umu.se-ecs-idp.xml
diff --git a/nya-1.0/wb11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/wb11.ladok.umu.se-ecs-sp.xml
index 346241b9..346241b9 100644
--- a/nya-1.0/wb11.ladok.umu.se-ecs-sp.xml
+++ b/swamid-2.0/wb11.ladok.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml
index d1319b4f..d1319b4f 100644
--- a/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml b/swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml
index 1a662e40..1a662e40 100644
--- a/swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml
+++ b/swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml
diff --git a/swamid-1.0/webwork.math.su.se-shibboleth.xml b/swamid-2.0/webwork.math.su.se-shibboleth.xml
index 97aed054..97aed054 100644
--- a/swamid-1.0/webwork.math.su.se-shibboleth.xml
+++ b/swamid-2.0/webwork.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/webwork2.math.su.se-shibboleth.xml b/swamid-2.0/webwork2.math.su.se-shibboleth.xml
index cbdb102d..cbdb102d 100644
--- a/swamid-1.0/webwork2.math.su.se-shibboleth.xml
+++ b/swamid-2.0/webwork2.math.su.se-shibboleth.xml
diff --git a/swamid-1.0/ws3.bmc.uu.se-shibboleth.xml b/swamid-2.0/ws3.bmc.uu.se-shibboleth.xml
index 15d2dce4..15d2dce4 100644
--- a/swamid-1.0/ws3.bmc.uu.se-shibboleth.xml
+++ b/swamid-2.0/ws3.bmc.uu.se-shibboleth.xml
diff --git a/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml b/swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
index 92b13f7c..92b13f7c 100644
--- a/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
index 0b183af7..0b183af7 100644
--- a/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
index 506d09fd..506d09fd 100644
--- a/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
diff --git a/swamid-1.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml b/swamid-2.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml
index 7d936fd8..7d936fd8 100644
--- a/swamid-1.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml
+++ b/swamid-2.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml
diff --git a/swamid-1.0/www.antagning.se-aws-sp.xml b/swamid-2.0/www.antagning.se-aws-sp.xml
index e2436e72..e2436e72 100644
--- a/swamid-1.0/www.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.antagning.se-aws-sp.xml
diff --git a/nya-1.0/www.antagning.se-ecs-sp.xml b/swamid-2.0/www.antagning.se-ecs-sp.xml
index 79886fde..79886fde 100644
--- a/nya-1.0/www.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/www.antagning.se-ecs-sp.xml
diff --git a/swamid-1.0/www.cambro.umu.se-shibboleth.xml b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
index 565e8106..565e8106 100644
--- a/swamid-1.0/www.cambro.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.diva-portal.org-shibboleth.xml b/swamid-2.0/www.diva-portal.org-shibboleth.xml
index 581a1cd1..581a1cd1 100644
--- a/swamid-1.0/www.diva-portal.org-shibboleth.xml
+++ b/swamid-2.0/www.diva-portal.org-shibboleth.xml
diff --git a/swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml b/swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml
index c431f94a..c431f94a 100644
--- a/swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml
+++ b/swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml
diff --git a/swamid-1.0/www.play.umu.se-shibboleth.xml b/swamid-2.0/www.play.umu.se-shibboleth.xml
index 7f178bc0..7f178bc0 100644
--- a/swamid-1.0/www.play.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.play.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.servicedesk.its.umu.se-shibboleth.xml b/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml
index 2c694e38..2c694e38 100644
--- a/swamid-1.0/www.servicedesk.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml
diff --git a/nya-1.0/www.servicedesk.umdac.umu.se-shibboleth.xml b/swamid-2.0/www.servicedesk.umdac.umu.se-shibboleth.xml
index d20cd4a8..d20cd4a8 100644
--- a/nya-1.0/www.servicedesk.umdac.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.servicedesk.umdac.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.studera.nyautb.its.umu.se-aws-sp.xml b/swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml
index 7740a3ca..7740a3ca 100644
--- a/swamid-1.0/www.studera.nyautb.its.umu.se-aws-sp.xml
+++ b/swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml
diff --git a/swamid-1.0/www.sub.su.se.xml b/swamid-2.0/www.sub.su.se.xml
index da8b32e0..da8b32e0 100644
--- a/swamid-1.0/www.sub.su.se.xml
+++ b/swamid-2.0/www.sub.su.se.xml
diff --git a/swamid-1.0/www.testa.antagning.se-aws-sp.xml b/swamid-2.0/www.testa.antagning.se-aws-sp.xml
index a3dbd377..a3dbd377 100644
--- a/swamid-1.0/www.testa.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.testa.antagning.se-aws-sp.xml
diff --git a/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
index 23ada522..23ada522 100644
--- a/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-1.0/www.testb.antagning.se-aws-sp.xml b/swamid-2.0/www.testb.antagning.se-aws-sp.xml
index b1040fe2..b1040fe2 100644
--- a/swamid-1.0/www.testb.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.testb.antagning.se-aws-sp.xml
diff --git a/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
index 4054c580..4054c580 100644
--- a/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml b/swamid-2.0/www.testc.ladok.umu.se-aws-sp.xml
index 4c191189..4c191189 100644
--- a/swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/www.testc.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml b/swamid-2.0/www.testd.ladok.umu.se-aws-sp.xml
index dcafb5d7..dcafb5d7 100644
--- a/swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml
+++ b/swamid-2.0/www.testd.ladok.umu.se-aws-sp.xml
diff --git a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
index 6f23e667..6f23e667 100644
--- a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-1.0/www.wisum.its.umu.se-shibboleth.xml b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
index 426edcd7..426edcd7 100644
--- a/swamid-1.0/www.wisum.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www.wisum.umdac.umu.se-shibboleth.xml b/swamid-2.0/www.wisum.umdac.umu.se-shibboleth.xml
index 04e88dce..04e88dce 100644
--- a/swamid-1.0/www.wisum.umdac.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.wisum.umdac.umu.se-shibboleth.xml
diff --git a/swamid-1.0/www07test.sub.su.se.xml b/swamid-2.0/www07test.sub.su.se.xml
index af0491df..af0491df 100644
--- a/swamid-1.0/www07test.sub.su.se.xml
+++ b/swamid-2.0/www07test.sub.su.se.xml
diff --git a/swamid-1.0/www3.genuinetext.com-shibboleth.xml b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
index d8f5e1fe..d8f5e1fe 100644
--- a/swamid-1.0/www3.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
diff --git a/swamid-1.0/www4.genuinetext.com-shibboleth.xml b/swamid-2.0/www4.genuinetext.com-shibboleth.xml
index 8f6d8288..8f6d8288 100644
--- a/swamid-1.0/www4.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www4.genuinetext.com-shibboleth.xml
diff --git a/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
index 952b04bc..952b04bc 100644
--- a/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml
+++ b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
diff --git a/swamid-discovery.mxml b/swamid-discovery.mxml
index 0220da4f..8fe77841 100644
--- a/swamid-discovery.mxml
+++ b/swamid-discovery.mxml
@@ -24,6 +24,4 @@ If You do not accept these Terms, then You must not continue to use this Metadat
     -->
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-idp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-sp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-edugain-1.0.mxml b/swamid-edugain-1.0.mxml
index c3c1dd5f..abb487d8 100644
--- a/swamid-edugain-1.0.mxml
+++ b/swamid-edugain-1.0.mxml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-edugain-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT2H">
-  <xi:include href="swamid-1.0/connect.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.nordu.net-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp-test.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/identity.mdh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp2.kau.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/kiidp.ki.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp-test.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/swamid.user.uu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
   <xi:include href="swamid-2.0/gidp.geant.net-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-1.0/login.liu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
-  <xi:include href="swamid-1.0/idp.it.su.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/hbidp.hb.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.student.bth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.bth.se-idp-shibboleth.xml"/> 
-  <xi:include href="swamid-1.0/login.du.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.hig.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.student.bth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.bth.se-idp-shibboleth.xml"/> 
+  <xi:include href="swamid-2.0/login.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/wiki.edugain.org-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shibb1.hj.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-edugain-testing-1.0.mxml b/swamid-edugain-testing-1.0.mxml
index 006eeb0f..a08af844 100644
--- a/swamid-edugain-testing-1.0.mxml
+++ b/swamid-edugain-testing-1.0.mxml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-kalmar-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT2H">
-  <xi:include href="swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/login.liu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.nordu.net-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp-test.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
+  <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp-test.swamid.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-fiv-test.mxml b/swamid-fiv-test.mxml
index 54e200f3..3a8a9240 100644
--- a/swamid-fiv-test.mxml
+++ b/swamid-fiv-test.mxml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <md:EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-fiv-test.xml">
-   <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
+   <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
    <xi:include href="fiv/aprikos.pingpong.net-shibboleth.xml"/>
    <xi:include href="fiv/aprikoslogin.pingpong.net-simplesaml-saml2-idp-metadata.php.xml"/>
    <xi:include href="fiv/paron.pingpong.net-shibboleth.xml"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index b3282029..74d60977 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -2,52 +2,52 @@
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 
                        xmlns:xi="http://www.w3.org/2001/XInclude" 
                        Name="http://md.swamid.se/md/swamid-idp-2.0.xml">
-   <xi:include href="swamid-1.0/idp.nordu.net-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.chalmers.se-adfs-services-trust.xml"/>
-   <xi:include href="swamid-1.0/idp.hig.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp2.hig.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.lnu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/login.du.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.mah.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/swamid.user.uu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.chalmers.se-adfs-services-trust.xml"/>
+   <xi:include href="swamid-2.0/idp.hig.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp2.hig.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.lnu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/login.du.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.mah.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.slu.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/login.liu.se-idp-shibboleth.xml"/>  
-   <xi:include href="swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.hkr.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.it.su.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
-   <xi:include href="swamid-1.0/idp2.kau.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shibb1.hj.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.bth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>  
+   <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.hkr.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.vhs.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
+   <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.bth.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/signon.hh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.irf.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/signon.hh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.bth.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.student.bth.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/identity.mdh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.it.gu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml"/>
-   <xi:include href="swamid-1.0/idp.konstfack.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.rkh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.kmh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml"/>
-   <xi:include href="swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.bth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.student.bth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>
+   <xi:include href="swamid-2.0/idp.konstfack.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
-   <xi:include href="nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
-   <xi:include href="swamid-1.0/kiidp.ki.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/swamid.shh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.suni.se-adfs-services-trust.xml"/>
-   <xi:include href="swamid-1.0/hbidp.hb.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.his.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp2.hv.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
+   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/swamid.shh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
+   <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp.mxml b/swamid-idp.mxml
index 39019461..0adfb3c0 100644
--- a/swamid-idp.mxml
+++ b/swamid-idp.mxml
@@ -23,5 +23,4 @@ If You do not accept these Terms, then You must not continue to use this Metadat
     -->
 
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-idp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml
index 87611147..9a9b2b85 100644
--- a/swamid-kalmar-1.0.mxml
+++ b/swamid-kalmar-1.0.mxml
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-kalmar-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H">
-  <xi:include href="swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/connect.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.diva-portal.org-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/crowd.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp.nordu.net-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/beta.lobber.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nordunet.tv-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/mailfilter.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/jabber.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/meetingtools.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect-beta.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/connect-stable.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
+  <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www.diva-portal.org-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/beta.lobber.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nordunet.tv-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/jabber.nordu.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/meetingtools.nordu.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/connect-stable.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
diff --git a/swamid-kalmar-testing-1.0.mxml b/swamid-kalmar-testing-1.0.mxml
index 6920392b..07561ba6 100644
--- a/swamid-kalmar-testing-1.0.mxml
+++ b/swamid-kalmar-testing-1.0.mxml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-kalmar-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H">
-  <xi:include href="swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml
index 37258626..7af18f6d 100644
--- a/swamid-ki-sll-1.0.mxml
+++ b/swamid-ki-sll-1.0.mxml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <md:EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-ki-sll-1.0.xml">
-  <xi:include href="swamid-1.0/kiidp.ki.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/samadhi.kib.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/samadhi.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/necs.sll.se.xml"/>
   <xi:include href="swamid-ki-sll-1.0/idp.sll.se-neas.xml"/>
-  <xi:include href="swamid-1.0/bibliometrics.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/bibliometrics.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/idpext.test.ek.sll.se-neas.xml"/>
diff --git a/swamid-no-interfederation-combined.mxml b/swamid-no-interfederation-combined.mxml
index 37c2e948..eb79fe32 100644
--- a/swamid-no-interfederation-combined.mxml
+++ b/swamid-no-interfederation-combined.mxml
@@ -27,6 +27,4 @@ If You do not accept these Terms, then You must not continue to use this Metadat
 
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-idp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-sp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7ed991fb..32d7f28f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -66,15 +66,15 @@
    <xi:include href="swamid-2.0/problem.math.su.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/kilw.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/selfservice.hb.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/expert.antagning.se-ecs-sp.xml"/>
-   <xi:include href="swamid-1.0/www.antagning.se-aws-sp.xml"/>
-   <xi:include href="swamid-1.0/www.universityadmissions.se-aws-sp-en.xml"/>
-   <xi:include href="swamid-1.0/expert.testa.antagning.se-ecs-sp.xml"/>
-   <xi:include href="swamid-1.0/www.testa.antagning.se-aws-sp.xml"/>
-   <xi:include href="swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
-   <xi:include href="swamid-1.0/expert.testb.antagning.se-ecs-sp.xml"/>
-   <xi:include href="swamid-1.0/www.testb.antagning.se-aws-sp.xml"/>
-   <xi:include href="swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
+   <xi:include href="swamid-2.0/expert.antagning.se-ecs-sp.xml"/>
+   <xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
+   <xi:include href="swamid-2.0/www.universityadmissions.se-aws-sp-en.xml"/>
+   <xi:include href="swamid-2.0/expert.testa.antagning.se-ecs-sp.xml"/>
+   <xi:include href="swamid-2.0/www.testa.antagning.se-aws-sp.xml"/>
+   <xi:include href="swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
+   <xi:include href="swamid-2.0/expert.testb.antagning.se-ecs-sp.xml"/>
+   <xi:include href="swamid-2.0/www.testb.antagning.se-aws-sp.xml"/>
+   <xi:include href="swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
    <xi:include href="swamid-2.0/kilwtest.it.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/lpwtest.it.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
@@ -87,183 +87,183 @@
    <xi:include href="swamid-2.0/se.timeedit.net-umu-employee-sp.xml"/>
    <xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>
    <xi:include href="swamid-2.0/scalear-saml.herokuapp.com.xml"/>
-   <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shib1.oru.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/sp-nya.bth.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/accountcheckout.lnu.se.xml"/>
-   <xi:include href="swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
-   <xi:include href="swamid-1.0/registrera.hb.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/aktivering.db.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/nacho.adm.gu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
-   <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/portal.mdh.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/sp.it.gu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
-   <xi:include href="nya-1.0/www.antagning.se-ecs-sp.xml"/>
-   <xi:include href="nya-1.0/aktivera-test.su.se-shibboleth.sso.xml"/>
-   <xi:include href="nya-1.0/aktivera.su.se-shibboleth.sso.xml"/>
-   <xi:include href="nya-1.0/www.servicedesk.umdac.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/account.mdh.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/order.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/dedserv79.levonline.com-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/mondo.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/mondo-test.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/ensky.lhs.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/www.wisum.umdac.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/beta.augustus.se.xml"/>
-   <xi:include href="swamid-1.0/dspace.it.su.se.xml"/>
-   <xi:include href="swamid-1.0/lists.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/pp-komm-admin.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/www.sub.su.se.xml"/>
-   <xi:include href="swamid-1.0/samsok.libris.kb.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shib-sp.kau.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/public.it.secure.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sp-nya.bth.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/akino.hh.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/accountcheckout.lnu.se.xml"/>
+   <xi:include href="swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-2.0/registrera.hb.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/aktivering.db.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/nacho.adm.gu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/portal.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.antagning.se-ecs-sp.xml"/>
+   <xi:include href="swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/aktivera.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/www.servicedesk.umdac.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/account.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/order.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/dedserv79.levonline.com-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/mondo.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/mondo-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/ensky.lhs.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.wisum.umdac.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/beta.augustus.se.xml"/>
+   <xi:include href="swamid-2.0/dspace.it.su.se.xml"/>
+   <xi:include href="swamid-2.0/lists.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/www.sub.su.se.xml"/>
+   <xi:include href="swamid-2.0/samsok.libris.kb.se-shibboleth.xml"/>
    <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
-   <xi:include href="swamid-1.0/mondo-web.it.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/cbs-vylvatest.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/labs.swami.se.xml"/>
-   <xi:include href="swamid-1.0/shibboleth.ebscohost.com.xml"/>
-   <xi:include href="swamid-1.0/www3.genuinetext.com-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/umdac-humpdac.ad.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/sp.lhs.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/moodle.lhs.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml"/>
-   <xi:include href="swamid-1.0/www.cambro.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/cambro-utv1.umdc.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/kurser.math.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/kurser3.math.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/webwork.math.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/webwork2.math.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/etenta.math.su.se"/>
-   <xi:include href="swamid-1.0/connect.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/connect-test.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/converis.info-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/sp.wavelan.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/samadhi.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/tcs-test.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-   <xi:include href="swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-   <xi:include href="swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-   <xi:include href="swamid-1.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-   <xi:include href="swamid-1.0/bibliometrics.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/uu.test.diva-portal.org-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/www4.genuinetext.com-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/beta.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/su.avedas.com-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/www.diva-portal.org-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/pp-edu-admin.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/minastudier-test.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/ladok-test.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/cambro-tst1.umdc.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/login.proxy.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/nordushare-dev.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/pp-migr-admin.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/pp-test-admin.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/mail.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/sp.tools.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/publications.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/pp-prod-admin.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/brainstorm.swami.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/beta.lobber.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/www07test.sub.su.se.xml"/>
-   <xi:include href="swamid-1.0/sp.kau.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/fordrop.irt.kth.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/minastudier.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/ladok.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/bardo.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/mailfilter-test.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/unitcf.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/crowd.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/rt-test-app1.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/confluence.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/jira.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/mailfilter.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/jira-test.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/rt.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/ilearn.dsv.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/connect.uninett.no-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/nagios.dev.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/dev.lobber.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/ws3.bmc.uu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/sp-test.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/smd-dev.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/vlab-chemsub.explizit.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/monitor.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/coip-test.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/betafoo.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/crowdtest.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/sp-test.swamid.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/lingon.ladok.umu.se-8087-sp.xml"/>
-   <xi:include href="swamid-1.0/ni.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/jabber.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/epc.ub.uu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/its-pd0001.ad.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/umdac-olho0001.ad.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/www.wisum.its.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/lpw.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/nordunet.tv-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/mailfilter.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/sutest.dsv.su.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/mds.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/meta.eduroam.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/meetingtools.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/play.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/smd.du.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/mds.lan.kth.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/mds-test.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/play.liu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/account.liu.se-shibboleth-sp.xml"/>
-   <xi:include href="swamid-1.0/nagios-vm.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/amiga.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/its-pd0030.ad.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/nagios.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
-   <xi:include href="swamid-1.0/its-pd0062.ad.umu.se-shibboleth-sp.xml"/>
-   <xi:include href="swamid-1.0/captivelan-test.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/pingpong.chalmers.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/vfu-gemdev.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/alpha.kib.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/www.play.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/mondo-web.it.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/cbs-vylvatest.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/labs.swami.se.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.ebscohost.com.xml"/>
+   <xi:include href="swamid-2.0/www3.genuinetext.com-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sp.lhs.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/moodle.lhs.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml"/>
+   <xi:include href="swamid-2.0/www.cambro.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/kurser.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/kurser3.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/webwork.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/webwork2.math.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/etenta.math.su.se"/>
+   <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/connect-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/converis.info-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/samadhi.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/tcs-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+   <xi:include href="swamid-2.0/bibliometrics.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/uu.test.diva-portal.org-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www4.genuinetext.com-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/beta.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/su.avedas.com-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.diva-portal.org-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/pp-edu-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/minastudier-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/ladok-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/nordushare-dev.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/pp-test-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/mail.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/sp.tools.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/publications.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/pp-prod-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/brainstorm.swami.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/beta.lobber.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www07test.sub.su.se.xml"/>
+   <xi:include href="swamid-2.0/sp.kau.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/fordrop.irt.kth.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/minastudier.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/ladok.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/bardo.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/unitcf.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/jira.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/mailfilter.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/rt.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/ilearn.dsv.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/connect.uninett.no-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/dev.lobber.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/ws3.bmc.uu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/smd-dev.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/vlab-chemsub.explizit.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/monitor.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/coip-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/betafoo.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/crowdtest.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sp-test.swamid.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/lingon.ladok.umu.se-8087-sp.xml"/>
+   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/jabber.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/lpw.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/nordunet.tv-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/sutest.dsv.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/meta.eduroam.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/meetingtools.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/play.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/smd.du.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/mds.lan.kth.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/mds-test.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/play.liu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/account.liu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-2.0/nagios-vm.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/amiga.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/its-pd0030.ad.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
+   <xi:include href="swamid-2.0/its-pd0062.ad.umu.se-shibboleth-sp.xml"/>
+   <xi:include href="swamid-2.0/captivelan-test.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/pingpong.chalmers.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/alpha.kib.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/www.play.umu.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
-   <xi:include href="swamid-1.0/play.hig.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/play.hig.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/maps.slu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/play.hb.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/betafoo.nordu.net-saml2-metadata.xml"/>
-   <xi:include href="swamid-1.0/vfu-test.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/vfu.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/captivelan.it.su.se-shibboleth.sso.xml"/>
-   <xi:include href="swamid-1.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
-   <xi:include href="swamid-1.0/mds2.nordu.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/cdn.nordunet.tv-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/gallus.scilifelab.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/play.mah.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/ni.nordu.net-saml2-metadata.xml"/>
+   <xi:include href="swamid-2.0/play.hb.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/betafoo.nordu.net-saml2-metadata.xml"/>
+   <xi:include href="swamid-2.0/vfu-test.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/vfu.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml"/>
+   <xi:include href="swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
+   <xi:include href="swamid-2.0/mds2.nordu.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/cdn.nordunet.tv-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/gallus.scilifelab.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/play.mah.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata.xml"/>
    <xi:include href="swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml"/>
-   <xi:include href="swamid-1.0/play.mdh.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/play.lu.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/connect-beta.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/connect-stable.sunet.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/testakt.it.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/testgag.it.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/download.portal.chalmers.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/portalservicesutv.miun.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/lpwdev.it.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/kilwdev.it.ki.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/test-ki.pingpong.net-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/egiswamid.egi.kth.se-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/hr.su.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/play.mdh.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/play.lu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/connect-stable.sunet.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/testakt.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/testgag.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/download.portal.chalmers.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/portalservicesutv.miun.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/lpwdev.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/kilwdev.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/test-ki.pingpong.net-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml"/>
    <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml"/>
    <xi:include href="swamid-2.0/pingpong.ki.se-shibboleth.xml"/>
diff --git a/swamid-testing-1.0.mxml b/swamid-testing-1.0.mxml
index 7c57cabe..a2251644 100644
--- a/swamid-testing-1.0.mxml
+++ b/swamid-testing-1.0.mxml
@@ -1,6 +1,5 @@
 <?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-testing-1.0.xml">
-  <xi:include href="swamid-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-testing-idp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-testing-sp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index a88d63fb..3d97e2d0 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -1,152 +1,152 @@
 <?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-testing-idp-1.0.xml">
-  <xi:include href="swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/coip-test.sunet.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/openidp.feide.no.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/login-dev.du.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/shibbo-test.ltu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/testshib.user.uu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/idp-test.kau.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/openidp.feide.no.xml"/>
+  <xi:include href="swamid-2.0/ab11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-externals-2.0/elegitimation2-test.inloggning.se.xml"/>
-  <xi:include href="swamid-1.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/minastudier.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/ladok3test.its.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-33.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-31.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-32.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-34.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-35.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/bhb-00.its.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/minastudier.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3test.its.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml"/>
   <xi:include href="swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml"/>
   <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml"/>
-  <xi:include href="swamid-1.0/idp-fre-1.eduid.se-idp.xml"/>
-  <xi:include href="swamid-1.0/selfservice.test.hb.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/ladok3.its.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/idp-fre-1.eduid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/selfservice.test.hb.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/ladok3.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/swamid2.shh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/idp3.hv.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp3.hv.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 72ca2a87..ec68ccda 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -1,307 +1,307 @@
 <?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-testing-sp-1.0.xml">
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/www.studera.nyautb.its.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/vhs-dev01.dyndns.org-shibboleth-sp.xml"/>
-  <xi:include href="swamid-1.0/smultron.catalogix.se-8090-sp.xml"/>
+  <xi:include href="swamid-2.0/ab11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/ab11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml"/>
+  <xi:include href="swamid-2.0/smultron.catalogix.se-8090-sp.xml"/>
   <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
-  <xi:include href="swamid-1.0/nya-31.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-31.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-31.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-31.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-32.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-32.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-32.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-32.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-33.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-33.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-33.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-33.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-34.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-34.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-34.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-34.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-35.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-35.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-35.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-35.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/vmfront.lan.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/www.testb.antagning.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/expert.testb.antagning.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/expert.testa.antagning.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/www.testa.antagning.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/expert.nyautb.its.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/expert.testc.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/expert.testd.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/www.nyautb.its.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/www.testc.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/www.testd.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-36.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-37.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-38.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-39.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-40.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-41.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-42.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-43.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-44.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-45.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-46.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-47.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-48.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-49.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/test-chalmers.pingpong.net-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/minasidor.ladok.umu.se-shib-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/vmfront.lan.kth.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www.testb.antagning.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/expert.testb.antagning.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/expert.testa.antagning.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/www.testa.antagning.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/www-en.testd.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/www-en.testc.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/expert.testc.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/expert.testd.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/www.testc.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/www.testd.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-01.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-02.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-02.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-03.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-03.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-04.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-05.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-05.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-06.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-06.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-07.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-07.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-08.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-08.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-09.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-09.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
+  <xi:include href="swamid-2.0/ladok3-10.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/ladok3test.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/nyautb.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-1.0/bhb-00.its.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-1.0/portalservicesutv.miun.se-shibboleth.xml"/>
-  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/ladok3-p00.ladok.umu.se-user-idp.xml"/>
+  <xi:include href="swamid-2.0/at11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/ft11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/it11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nb11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/nyautb.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/wb11.ladok.umu.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/bhb-00.its.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/portalservicesutv.miun.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-1.0/sigma-test-localhost-sp-130705.xml"/>
-  <xi:include href="swamid-1.0/kisetest2.user.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sigma-test-localhost-sp-130705.xml"/>
+  <xi:include href="swamid-2.0/kisetest2.user.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml"/>
 </EntitiesDescriptor>