replace uniq -D with uniq -d for macos compatibility

22 files changed, 3 insertions, 1217 deletions

diff --git a/Makefile b/Makefile
index bf374beb..cb0f3284 100644
--- a/Makefile
+++ b/Makefile
@@ -154,9 +154,9 @@ testMDUI:
 	@echo "Checking for bad lang codes"
 	@for x in swamid-2.0/*.xml ; do bad_langs=`cat $$x | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u | grep -vxE 'cs|da|de|en|fi|fr|it|sv'` ; if [ -n "$$bad_langs" ] ; then echo "  $$x: `echo $$bad_langs`" | sed 's/.*/&/' ; fi ; done
 	@echo "Check for mismatch between MDUI DisplayName and OrganizationDisplayName"
-	@for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do for lang in `cat $$x | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do mdui_displayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor//UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ 	]*//;s/[ 	]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` organizationdisplayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ 	]*//;s/[ 	]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ; if [ -n "$$mdui_displayname" -a -n "$$organizationdisplayname" -a "$$mdui_displayname" != "$$organizationdisplayname" ] ; then echo "$$x: $$lang '$$mdui_displayname' vs $$lang '$$organizationdisplayname'" | sed 's/.*/&/'; fi ; done ; done
+	@for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do for lang in `cat $$x | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do mdui_displayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor//UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ 	]*//;s/[ 	]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` organizationdisplayname=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ 	]*//;s/[ 	]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ; if [ -n "$$mdui_displayname" -a -n "$$organizationdisplayname" -a "$$mdui_displayname" != "$$organizationdisplayname" ] ; then echo "$$x: $$lang '$$mdui_displayname' vs $$lang '$$organizationdisplayname'" | sed 's/.*/&/'; fi ; done ; done | grep . && exit 1 || true
 	@echo "Checking for uniq IdP MDUI DisplayName"
-	@for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[       ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^;  $$x $$lang ;" | sed 's/.*/&/' ; done | sort -k 3 | uniq -D -f 2 ; done #| grep . && exit 1 || true
+	@for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[       ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^;  $$x $$lang ;" | sed 's/.*/&/' ; done | sort -k 3 | uniq -d -f 2 ; done | grep . && exit 1 || true
 	@echo "Checking for invalid IPHint"
 	@for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed -n 's;.*<[a-z0-9:]*IPHint>\(.*\)</[a-z0-9:]*IPHint>;\1;p' | grep -q -vE '^$$|^[0-9./a-fA-F:]*$$' ; then echo "  $$x" | sed 's/.*/&/' ; fi ; done
 	@echo "Checking for invalid geodata (syntax is geo:xx.yy,zz.vv)"
@@ -171,7 +171,7 @@ testMDUIreach:
 
 testOrgData:
 	@echo "Checking for uniq IdP OrganizationDisplayName"
-	@for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ 	]*//;s/[ 	]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^;$$x $$lang ;" | sed 's/.*/\ \ &/' ; done | sort -k 3 | uniq -D -f 2 ; done
+	@for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[ 	]*//;s/[ 	]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^;$$x $$lang ;" | sed 's/.*/\ \ &/' ; done | sort -k 3 | uniq -d -f 2 ; done | grep . && exit 1 || true
 
 testEntCat:
 	@echo "Checking for entity-categories in SPSSODescriptors that should be moved to EntityDescriptor/Extensions"
diff --git a/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml b/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml
deleted file mode 100644
index ed639a43..00000000
--- a/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dreamspark.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF+jCCBOKgAwIBAgIKLqDfHAAIAAGj6DANBgkqhkiG9w0BAQUFADCBizETMBEG CgmSJomT8ixkARkWA2NvbTEZMBcGCgmSJomT8ixkARkWCW1pY3Jvc29mdDEUMBIG CgmSJomT8ixkARkWBGNvcnAxFzAVBgoJkiaJk/IsZAEZFgdyZWRtb25kMSowKAYD VQQDEyFNaWNyb3NvZnQgU2VjdXJlIFNlcnZlciBBdXRob3JpdHkwHhcNMTAwNzMw MDAyMTA4WhcNMTEwNzMwMDAyMTA4WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK V2FzaGluZ3RvbjEQMA4GA1UEBxMHU2VhdHRsZTETMBEGA1UEChMKRmFzdCBUcmFj azEUMBIGA1UECxMLRHJlYW0gU3BhcmsxGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJr LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtsyFSuceS0RVGHD1Qbch DWIdIGfELS06JXkb6EJELGld5j4P50fGSqMXDcPIt3jHqjt9jnd5aqJP4Z5ROs5p hJ7fXtm56taeSVTfZSQRIzlVyaIG1QSKeqdlt6GWZrlV+Gy2cKAglMcKh5/y5ISP /TbQWeJtreT+Pi/Aj0IQcGUCAwEAAaOCAvAwggLsMAsGA1UdDwQEAwIEsDBEBgkq hkiG9w0BCQ8ENzA1MA4GCCqGSIb3DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwBwYF Kw4DAgcwCgYIKoZIhvcNAwcwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB MB0GA1UdDgQWBBT2xedjpxaZG/9bcyw3cEROspTL0DAfBgNVHSMEGDAWgBQIQuPb ThFm87UIxUDbVXwzRhGDODCCAQoGA1UdHwSCAQEwgf4wgfuggfiggfWGWGh0dHA6 Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL01pY3Jvc29mdCUy MFNlY3VyZSUyMFNlcnZlciUyMEF1dGhvcml0eSg4KS5jcmyGVmh0dHA6Ly9jcmwu bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9NaWNyb3NvZnQlMjBTZWN1cmUl MjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3JshkFodHRwOi8vY29ycHBraS9jcmwv TWljcm9zb2Z0JTIwU2VjdXJlJTIwU2VydmVyJTIwQXV0aG9yaXR5KDgpLmNybDCB vwYIKwYBBQUHAQEEgbIwga8wXgYIKwYBBQUHMAKGUmh0dHA6Ly93d3cubWljcm9z b2Z0LmNvbS9wa2kvbXNjb3JwL01pY3Jvc29mdCUyMFNlY3VyZSUyMFNlcnZlciUy MEF1dGhvcml0eSg4KS5jcnQwTQYIKwYBBQUHMAKGQWh0dHA6Ly9jb3JwcGtpL2Fp YS9NaWNyb3NvZnQlMjBTZWN1cmUlMjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3J0 MD8GCSsGAQQBgjcVBwQyMDAGKCsGAQQBgjcVCIPPiU2t8gKFoZ8MgvrKfYHh+3SB T4PC7YUIjqnShWMCAWQCAQkwJwYJKwYBBAGCNxUKBBowGDAKBggrBgEFBQcDAjAK BggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOCAQEACAHi+mcrNHJ/W+uBtnzD3mAm ai3QiLWiJE3dKuNtHV8Ba64E2l69Q7pmnFCr1eM5wlvnQcOqbVyZjk/okp4aRxBw ARn3KtvkhbSOHjaDYv3FXvobBXgenbPFydPvNmQrPGdTRSUf+q4duaYVSx2YAqpr HnYDbddNBJuFzfyywu6WSsrwgqUUW3jAaNmcrX7U5Z/sN1CQVOcx4dQ3nqXTYbgm 5+nddJhnC9PDyK4A4epAO9CA7h9023fRh9AZx17dgpRtteb+8JlV1+iMRdG/VrJK Gmnt8WCQFfOSQNChmicJikdzGfjtDjOqKA5g5CxxrwKWO7S5DaDH7Q286CkSXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS" index="7"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Microsoft</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>DreamSpark Engineering Team</GivenName>
-    <EmailAddress>dsengt@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Scott</GivenName>
-    <SurName>Blackwell</SurName>
-    <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml b/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml
deleted file mode 100644
index f96a3e32..00000000
--- a/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.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.antagning.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">antagning.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">NyA DW-IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NyA DW-IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för DW-användare i NyA (UHR)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider för DW-användare i NyA (UHR)</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBsTCCAVugAwIBAgIJAKLW8BnDv4qgMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTAeFw0xMTAxMjAxNzM4NTFaFw0yMTAxMTcxNzM4NTFaMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3SHcbLV+BNfaJOb+jBVAxL8snvg/8M85YJR+hn2srvkeo4a5RLt2iY49PIXbEAqqNASVeZrQZ76jz3YMujBRdAgMBAAGjfjB8MB0GA1UdDgQWBBSGFxfUifschCgYSdCjsXoFZEbIkDBNBgNVHSMERjBEgBSGFxfUifschCgYSdCjsXoFZEbIkKEhpB8wHTEbMBkGA1UEAxMSZHdpZHAuYW50YWduaW5nLnNlggkAotbwGcO/iqAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJg+mYzJ0q5UjJCXgxPA57NCtSuiKhVXO/ucjAW10GhEXVqEN8hkYyX9l1cPe1vElWNVLjp18zyHYvkrOKoszJw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.antagning.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.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.antagning.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">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBsTCCAVugAwIBAgIJAKLW8BnDv4qgMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTAeFw0xMTAxMjAxNzM4NTFaFw0yMTAxMTcxNzM4NTFaMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3SHcbLV+BNfaJOb+jBVAxL8snvg/8M85YJR+hn2srvkeo4a5RLt2iY49PIXbEAqqNASVeZrQZ76jz3YMujBRdAgMBAAGjfjB8MB0GA1UdDgQWBBSGFxfUifschCgYSdCjsXoFZEbIkDBNBgNVHSMERjBEgBSGFxfUifschCgYSdCjsXoFZEbIkKEhpB8wHTEbMBkGA1UEAxMSZHdpZHAuYW50YWduaW5nLnNlggkAotbwGcO/iqAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJg+mYzJ0q5UjJCXgxPA57NCtSuiKhVXO/ucjAW10GhEXVqEN8hkYyX9l1cPe1vElWNVLjp18zyHYvkrOKoszJw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.antagning.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/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml b/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
deleted file mode 100644
index ddc03c28..00000000
--- a/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.antagning.se/ecs-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">ecsidp.antagning.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">NyA Expert-IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NyA Expert-IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Expert-användare i NyA (UHR)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider för Expert-användare i NyA (UHR)</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.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://ecsidp.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.antagning.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">ecsidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UHR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">NyA Expert-IdP</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NyA Expert-IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Swedish Council for Higher Education</Company>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml
deleted file mode 100644
index ebf390a0..00000000
--- a/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hgo.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">hgo.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
-5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
-2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
-93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
-2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
-Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
-VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
-2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
-mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
-G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
-8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
-UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hgo.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hgo.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hgo.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">hgo.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
-5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
-2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
-93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
-2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
-Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
-VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
-2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
-mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
-G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
-8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
-UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HGO</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan på Gotland</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Högskolan på Gotland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hgo.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Joacim</GivenName>
-    <SurName>Breiler</SurName>
-    <EmailAddress>joacim.breiler@hgo.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index ab880659..00000000
--- a/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.kau.se/simplesaml/saml2/idp/metadata.php">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karlstad university (test)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Scott</md:SurName>
-    <md:EmailAddress>paul.scott@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.lhs.se-identity.xml b/swamid-2.0-obsolete/idp.lhs.se-identity.xml
deleted file mode 100644
index d7b520c3..00000000
--- a/swamid-2.0-obsolete/idp.lhs.se-identity.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lhs.se/identity">
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">lhs.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIByzCCATSgAwIBAgIBADANBgkqhkiG9w0BAQUFADAVMRMwEQYDVQQDEwppZHAubGhzLnNlMB4XDTA3MTAwMTExMjExOFoXDTA4MDkzMDExMjExOFowFTETMBEGA1UEAxMKaWRwLmxocy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtSdeqn5nVMW4+ctoX2rGMh/o62G6qypOuVIWnKLK10B+pZ7bw8bqJ17zjVqjDKxNvX5QyPXD/mp+K1MPjCfw6Hgf6n2acXiXVXOZPQ+858dBmLzIl3fJAh+t7V3mdbT/PcjgMtgbCWZ48N0xquknoXS2KUOru0W7voTuHxqDOMUCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQAUAndrDJLIPtAmRnE1PmfQpMkO0Cn2HofaiWmmtG6n/IfGFql1cuyTSl9a2kMkHRNK1POUC7fypNmSFhBBxtvtdohCAJLoSKpZXd9KdE5tN2YgMlUFIfPd+2gVD4adgtKNspWQIp5uo83K5RQqSFdJrtQhmB8GjGbR3lRGzu46lg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhs.se:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">lhs.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIByzCCATSgAwIBAgIBADANBgkqhkiG9w0BAQUFADAVMRMwEQYDVQQDEwppZHAubGhzLnNlMB4XDTA3MTAwMTExMjExOFoXDTA4MDkzMDExMjExOFowFTETMBEGA1UEAxMKaWRwLmxocy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtSdeqn5nVMW4+ctoX2rGMh/o62G6qypOuVIWnKLK10B+pZ7bw8bqJ17zjVqjDKxNvX5QyPXD/mp+K1MPjCfw6Hgf6n2acXiXVXOZPQ+858dBmLzIl3fJAh+t7V3mdbT/PcjgMtgbCWZ48N0xquknoXS2KUOru0W7voTuHxqDOMUCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQAUAndrDJLIPtAmRnE1PmfQpMkO0Cn2HofaiWmmtG6n/IfGFql1cuyTSl9a2kMkHRNK1POUC7fypNmSFhBBxtvtdohCAJLoSKpZXd9KdE5tN2YgMlUFIfPd+2gVD4adgtKNspWQIp5uo83K5RQqSFdJrtQhmB8GjGbR3lRGzu46lg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhs.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lhs.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LHS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lärarhögskolan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lhs.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Lärarhögskolan</Company>
-    <EmailAddress>info@lhs.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.secure.su.se-identity.xml b/swamid-2.0-obsolete/idp.secure.su.se-identity.xml
deleted file mode 100644
index 718248a3..00000000
--- a/swamid-2.0-obsolete/idp.secure.su.se-identity.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.secure.su.se/identity">
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEsjCCA5qgAwIBAgILAQAAAAABFxsEM3owDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3MTIyNzA5NTIxNVoXDTEwMTIyNzA5NTIxNVowXTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEZMBcGA1UEAxMQaWRwLnNlY3VyZS5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8J47onJaot9vYgL5d+VXRuBTlwy4quLRkcFDvAhy9YwzdDAZ0bio2qgVpXMK1aP1kvpOn6+Zy9jUKuwaUraJpE8Yp7dCzTXujrCQSS3sfy+pTwS/kcDUM/sBd16gXU4lfub56+Oiuvi9eRISDKTeZebgTskN2O7gZS91nLSo7xz/Fsrinp3oRWcqZ0VWzc0+zLIldU50ASZ/AqDQQ/JLaqI84b6Ft8JjWZKCGUqBBoRURjvDxqr2e19i2+2mu5Cbayq6IJ62yH+dP3pVd9UZntSXABaTnq2+v9dt/unhOXibzMwh87q+fI9w7SyM7Wy/r6V3qk/aes0bYI6Sj8DW0CAwEAAaOCAW8wggFrMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFMAf54GaLCmlAHIKbGBskYgJ64yTMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHREEFDASghBpZHAuc2VjdXJlLnN1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQA2ZODtOolJMQNFz86urE/RM3LIwkaaRHv9WN743WEPVyrQ0s7XjYuHAuJCuLVhwteA0ODpbmYJHaesG1O4Hqilv/tRD+8MahGWqA2lk28T7mkx+/Hb2jsZWBIMGNNOf97sZUK100wbnsFvjvBsOAsznnRX2JKOBeemOnIPZR1EmA+VRxUaIHb2/SD63zSsa/+y8xkSYAo1Pxr9MU6jePNIPnMF7ixwfzTZElyoxKuNNbQAuxfvvbRElGs2YCmC9WBY8zGmyHfNWWblVt5tjeNH0pWu+qg1tVBSB9VZZ4xGuKgoMyoYKul4y3raQRiUCUaUmJCdAiQNqsSMpY3QpA+k</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.secure.su.se:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEsjCCA5qgAwIBAgILAQAAAAABFxsEM3owDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3MTIyNzA5NTIxNVoXDTEwMTIyNzA5NTIxNVowXTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEZMBcGA1UEAxMQaWRwLnNlY3VyZS5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8J47onJaot9vYgL5d+VXRuBTlwy4quLRkcFDvAhy9YwzdDAZ0bio2qgVpXMK1aP1kvpOn6+Zy9jUKuwaUraJpE8Yp7dCzTXujrCQSS3sfy+pTwS/kcDUM/sBd16gXU4lfub56+Oiuvi9eRISDKTeZebgTskN2O7gZS91nLSo7xz/Fsrinp3oRWcqZ0VWzc0+zLIldU50ASZ/AqDQQ/JLaqI84b6Ft8JjWZKCGUqBBoRURjvDxqr2e19i2+2mu5Cbayq6IJ62yH+dP3pVd9UZntSXABaTnq2+v9dt/unhOXibzMwh87q+fI9w7SyM7Wy/r6V3qk/aes0bYI6Sj8DW0CAwEAAaOCAW8wggFrMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFMAf54GaLCmlAHIKbGBskYgJ64yTMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHREEFDASghBpZHAuc2VjdXJlLnN1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQA2ZODtOolJMQNFz86urE/RM3LIwkaaRHv9WN743WEPVyrQ0s7XjYuHAuJCuLVhwteA0ODpbmYJHaesG1O4Hqilv/tRD+8MahGWqA2lk28T7mkx+/Hb2jsZWBIMGNNOf97sZUK100wbnsFvjvBsOAsznnRX2JKOBeemOnIPZR1EmA+VRxUaIHb2/SD63zSsa/+y8xkSYAo1Pxr9MU6jePNIPnMF7ixwfzTZElyoxKuNNbQAuxfvvbRElGs2YCmC9WBY8zGmyHfNWWblVt5tjeNH0pWu+qg1tVBSB9VZZ4xGuKgoMyoYKul4y3raQRiUCUaUmJCdAiQNqsSMpY3QpA+k</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.secure.su.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.secure.su.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SUOLD</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Stockholms Universitet (gamla inloggningen)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Stockholm University (old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm University</Company>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.test.umu.se-identity.xml b/swamid-2.0-obsolete/idp.test.umu.se-identity.xml
deleted file mode 100644
index 9b301645..00000000
--- a/swamid-2.0-obsolete/idp.test.umu.se-identity.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.test.umu.se/identity">
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.umu.se:9443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.umu.se:9443/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.test.umu.se:9443/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>UMDAC</Company>
-    <GivenName>Einar</GivenName>
-    <SurName>Hillbom</SurName>
-    <EmailAddress>einar.hillbom@umdac.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml b/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml
deleted file mode 100644
index 500b3a78..00000000
--- a/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/shib13/idp/metadata.php">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.umu.se/shib13/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
-    <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University (SAML1)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Umeå universitet (SAML1)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Datordrift</md:SurName>
-    <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml
deleted file mode 100644
index 3e14b10f..00000000
--- a/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.irf.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">irf.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUc74js9dRvbf1KNNKFdoKAZ3Td2cwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzEwMTI1NzQxWhcNMzAw
-MzEwMTI1NzQxWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAK/A9Csx8DKOhm2POYJ+sXKTVSFKvkPBwylanX8R
-Zs231QpViJAGisUZe77pEgQriQi7IgKM7X0olaZspkzcLrK3170z5nXCTtcVB+jC
-beGfoqE5wgElSi53TCUWVGhVKOndklYLrGawurN4v8jdI6smaOQRKQAV+0NbbjI6
-uME1w9sqdvDPo0g9NAlr4jfPVz/NwVp6xnzs0IPZuYgxb1g2iY6lEgs1/W7H4Kit
-Hm+kTBPaWGEE5f38mGbFCqmyfnWM8l2W9nWwpf+vgtB9lK6CP255OjNhCALMOosR
-4TVoC/Htkr6+OukiA2xnGNXUxkzPilnpavbygEmMGwHleVECAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMS5pcmYuc2WGImh0dHBzOi8vaWRwMS5pcmYuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFKXU8NQrZt3kxcBNeMhPig237jUPMA0GCSqGSIb3
-DQEBBQUAA4IBAQCAn0jjiU08tmYmB9DwUZ1ZuMj+L/sAbqOyIRkcDwVD6HcB3HUD
-NwsqShpuG4ciggHH70/lRKXbKyhOc3/9L+yMGADivO2yFvG5cG++Z/AGhaOUMQEd
-jEp0q5N9H9yEHJEusx6CG+89neeXPYur2STexspPjOtdymkDla7Npgdnb61/3u9e
-O8AwyVHsB1XhyQ6sDiPhum5ZWXLz6SZc8AKrUFe3ZOk6osXO79u2xJp5K7o+ihKs
-pmmsdRKvHmnn0lzvLPkt4I0TjJ1mjC76HfMswn2LZF3sRDpU+O+dvJVJTdXgXD7C
-s8bdl69BX1bpjKcPiO5aQVzP1rPysa6vEfcr
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.irf.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://idp1.irf.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.irf.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.irf.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">irf.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUc74js9dRvbf1KNNKFdoKAZ3Td2cwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzEwMTI1NzQxWhcNMzAw
-MzEwMTI1NzQxWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAK/A9Csx8DKOhm2POYJ+sXKTVSFKvkPBwylanX8R
-Zs231QpViJAGisUZe77pEgQriQi7IgKM7X0olaZspkzcLrK3170z5nXCTtcVB+jC
-beGfoqE5wgElSi53TCUWVGhVKOndklYLrGawurN4v8jdI6smaOQRKQAV+0NbbjI6
-uME1w9sqdvDPo0g9NAlr4jfPVz/NwVp6xnzs0IPZuYgxb1g2iY6lEgs1/W7H4Kit
-Hm+kTBPaWGEE5f38mGbFCqmyfnWM8l2W9nWwpf+vgtB9lK6CP255OjNhCALMOosR
-4TVoC/Htkr6+OukiA2xnGNXUxkzPilnpavbygEmMGwHleVECAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMS5pcmYuc2WGImh0dHBzOi8vaWRwMS5pcmYuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFKXU8NQrZt3kxcBNeMhPig237jUPMA0GCSqGSIb3
-DQEBBQUAA4IBAQCAn0jjiU08tmYmB9DwUZ1ZuMj+L/sAbqOyIRkcDwVD6HcB3HUD
-NwsqShpuG4ciggHH70/lRKXbKyhOc3/9L+yMGADivO2yFvG5cG++Z/AGhaOUMQEd
-jEp0q5N9H9yEHJEusx6CG+89neeXPYur2STexspPjOtdymkDla7Npgdnb61/3u9e
-O8AwyVHsB1XhyQ6sDiPhum5ZWXLz6SZc8AKrUFe3ZOk6osXO79u2xJp5K7o+ihKs
-pmmsdRKvHmnn0lzvLPkt4I0TjJ1mjC76HfMswn2LZF3sRDpU+O+dvJVJTdXgXD7C
-s8bdl69BX1bpjKcPiO5aQVzP1rPysa6vEfcr
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.irf.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRF</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mats</GivenName>
-    <SurName>Luspa</SurName>
-    <EmailAddress>matsl@irf.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml
deleted file mode 100644
index 02bffddc..00000000
--- a/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.unit.liu.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">liu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUL9NrL6v4aXTO+WnTc/pTLVej0o8wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwMS51bml0LmxpdS5zZTAeFw0wOTA2MjUwNjIxMTRa
-Fw0yOTA2MjUwNjIxMTRaMBsxGTAXBgNVBAMTEGlkcDEudW5pdC5saXUuc2UwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCByYjmpeGcN/HcpxCZEH1HSsZ3
-KyBS8xf8wac86C51yYtVj8Q/Xsb467VqwRbA/HeOMxtKxmuJXSO4nWHVCQQ7wDI2
-7q5/LJCXVJ/ruMLDykb2nSxM10Z0eiyxFIxJlnzUyHY+etPD2bZy2u2vQoS/X444
-RRhwMTOvHOw9fQpBngXXfxypv8YvSVQ9vIcKvRc9VlypiXXDqCBqG0FscwVuQGzU
-V8MaNhbMp02pjlAfuMg4S7yCP5Dt06N09gqXuvGB0A/rvVNJnyBbbrwaPy1RNxhP
-jQbbthT3ostMmaYpUITXX3mEzWlyU88jRhjRKn4lZDRnFCIovXs0VO9NkNZ7AgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcDEudW5pdC5saXUuc2WGJ2h0dHBzOi8vaWRw
-MS51bml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxohFt42mx6y6
-0tGVGwUT2QAnsGUwDQYJKoZIhvcNAQEFBQADggEBAGwXP3gyV2Aa6YxYAruv0Zdg
-DrKijhKsOFAAsWU1P42yW/gYf9na90cAxYwZ37CE2rzbNxz4MUKtko2/2aGKWSZh
-BdK2vJGCD8tyiJLmPpmJ4JoLV5gZHEZctAQ96r3+oj9Tqv/p/URoktAHIA4wmz+0
-sx+zkbDicFCvGJ2e3AHdxHklQK9Vs8njbmkKTxIFjU9iHntK1K4DIhIYbItd7pOw
-bZoWErCv/72HTScd6cjOwu6He4nAraDiTcqobdMUVQ61dm425OQFcdqpNx6uCC4F
-dUEqq3+CKSvEAMSbdXUY3cQClvE72Yr8fk2c7iM2dNChI1XyG1GcM5qDlrs4U0U=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.unit.liu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.unit.liu.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">liu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUL9NrL6v4aXTO+WnTc/pTLVej0o8wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwMS51bml0LmxpdS5zZTAeFw0wOTA2MjUwNjIxMTRa
-Fw0yOTA2MjUwNjIxMTRaMBsxGTAXBgNVBAMTEGlkcDEudW5pdC5saXUuc2UwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCByYjmpeGcN/HcpxCZEH1HSsZ3
-KyBS8xf8wac86C51yYtVj8Q/Xsb467VqwRbA/HeOMxtKxmuJXSO4nWHVCQQ7wDI2
-7q5/LJCXVJ/ruMLDykb2nSxM10Z0eiyxFIxJlnzUyHY+etPD2bZy2u2vQoS/X444
-RRhwMTOvHOw9fQpBngXXfxypv8YvSVQ9vIcKvRc9VlypiXXDqCBqG0FscwVuQGzU
-V8MaNhbMp02pjlAfuMg4S7yCP5Dt06N09gqXuvGB0A/rvVNJnyBbbrwaPy1RNxhP
-jQbbthT3ostMmaYpUITXX3mEzWlyU88jRhjRKn4lZDRnFCIovXs0VO9NkNZ7AgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcDEudW5pdC5saXUuc2WGJ2h0dHBzOi8vaWRw
-MS51bml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxohFt42mx6y6
-0tGVGwUT2QAnsGUwDQYJKoZIhvcNAQEFBQADggEBAGwXP3gyV2Aa6YxYAruv0Zdg
-DrKijhKsOFAAsWU1P42yW/gYf9na90cAxYwZ37CE2rzbNxz4MUKtko2/2aGKWSZh
-BdK2vJGCD8tyiJLmPpmJ4JoLV5gZHEZctAQ96r3+oj9Tqv/p/URoktAHIA4wmz+0
-sx+zkbDicFCvGJ2e3AHdxHklQK9Vs8njbmkKTxIFjU9iHntK1K4DIhIYbItd7pOw
-bZoWErCv/72HTScd6cjOwu6He4nAraDiTcqobdMUVQ61dm425OQFcdqpNx6uCC4F
-dUEqq3+CKSvEAMSbdXUY3cQClvE72Yr8fk2c7iM2dNChI1XyG1GcM5qDlrs4U0U=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LiU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Linköping University (TEST IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Linköping University</Company>
-    <EmailAddress>jonathan.sussemilch.poulain@liu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml b/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml
deleted file mode 100644
index fee019fe..00000000
--- a/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://medieportaltest.kau.se/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://medieportaltest.kau.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mediaportaltest.kau.se</ds:KeyName>
-        <ds:KeyName>medieportaltest.kau.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=medieportaltest.kau.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAKDRtBQXxP+HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFm1lZGllcG9ydGFsdGVzdC5rYXUuc2UwHhcNMTExMDE2MDQyNjM0WhcNMjEx
-MDEzMDQyNjM0WjAhMR8wHQYDVQQDExZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuChTNh0yraiIg2lZxckf3B1
-6C5X/dLrN5UADuCBSgGg7AkYxHR4OKf2mjYURDpb0ULVUUKSZmQ9j+mubvUlYPTl
-16zusB+uILVkt40Bz7bYNcyuL3Gqohy2M0EvuEtFQx4rA85Xhgeb2K1YSnAhA+rm
-HX9Z1Wr7+w7ogOVvXuk0QBSE1iKhYRmFArs0ggKtT0A2gi9GiXIXSoCk0J9bHCDa
-djalxYbvOmIXjHn7B/wI0u/SCVT+kp9dm/EDOFRsiK+JO7kIVrOFiNa1Uyupzi+P
-VmkfsFsVM/7vyzAcWiuAPX+N3gNaD8Mqc9xZVuRHWcpTIYEFQLh6am+XjrGVCQID
-AQABo1wwWjA5BgNVHREEMjAwghZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlhhZtZWRp
-YXBvcnRhbHRlc3Qua2F1LnNlMB0GA1UdDgQWBBQ9J62qTGrTe6JgehYM3S0bK6AD
-JzANBgkqhkiG9w0BAQUFAAOCAQEAYv20nFTbODqZkvRZtJU/3ApoYR5mmudiM/Fw
-eIKlR3OcPZ6+qhynkvAVjRav9PL7xEwOQtbgUC/k/PHnVjK/TyDcgXDogdlYXXZW
-layAJyHHeo4pjF1msBH8RUi1LqLKatbL2/U6XuGq3oLV7Cha8FQwDaZLyPiNYK9t
-DPYtUI1uVdM2kQhU/ia1WCOtntRZ9qx/n+T+FX7Q8JWHhEoi46iEJ1AA4xMELSz2
-O+GySKfdTPfjd9jbUhHo/KHutxtVLWPh3BGR1RSEAAIzGsI9N5s+yFXXf/MVgieY
-GUwA19+wdyIxPgPJxJjsz6+zXMVTPRLexVBhGepW+c9w69YV3Q==
-</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>mediaportaltest.kau.se</ds:KeyName>
-        <ds:KeyName>medieportaltest.kau.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=medieportaltest.kau.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAKDRtBQXxP+HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFm1lZGllcG9ydGFsdGVzdC5rYXUuc2UwHhcNMTExMDE2MDQyNjM0WhcNMjEx
-MDEzMDQyNjM0WjAhMR8wHQYDVQQDExZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuChTNh0yraiIg2lZxckf3B1
-6C5X/dLrN5UADuCBSgGg7AkYxHR4OKf2mjYURDpb0ULVUUKSZmQ9j+mubvUlYPTl
-16zusB+uILVkt40Bz7bYNcyuL3Gqohy2M0EvuEtFQx4rA85Xhgeb2K1YSnAhA+rm
-HX9Z1Wr7+w7ogOVvXuk0QBSE1iKhYRmFArs0ggKtT0A2gi9GiXIXSoCk0J9bHCDa
-djalxYbvOmIXjHn7B/wI0u/SCVT+kp9dm/EDOFRsiK+JO7kIVrOFiNa1Uyupzi+P
-VmkfsFsVM/7vyzAcWiuAPX+N3gNaD8Mqc9xZVuRHWcpTIYEFQLh6am+XjrGVCQID
-AQABo1wwWjA5BgNVHREEMjAwghZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlhhZtZWRp
-YXBvcnRhbHRlc3Qua2F1LnNlMB0GA1UdDgQWBBQ9J62qTGrTe6JgehYM3S0bK6AD
-JzANBgkqhkiG9w0BAQUFAAOCAQEAYv20nFTbODqZkvRZtJU/3ApoYR5mmudiM/Fw
-eIKlR3OcPZ6+qhynkvAVjRav9PL7xEwOQtbgUC/k/PHnVjK/TyDcgXDogdlYXXZW
-layAJyHHeo4pjF1msBH8RUi1LqLKatbL2/U6XuGq3oLV7Cha8FQwDaZLyPiNYK9t
-DPYtUI1uVdM2kQhU/ia1WCOtntRZ9qx/n+T+FX7Q8JWHhEoi46iEJ1AA4xMELSz2
-O+GySKfdTPfjd9jbUhHo/KHutxtVLWPh3BGR1RSEAAIzGsI9N5s+yFXXf/MVgieY
-GUwA19+wdyIxPgPJxJjsz6+zXMVTPRLexVBhGepW+c9w69YV3Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://medieportaltest.kau.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/roundup.it.su.se.xml b/swamid-2.0-obsolete/roundup.it.su.se.xml
deleted file mode 100644
index c1393c6c..00000000
--- a/swamid-2.0-obsolete/roundup.it.su.se.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://roundup.it.su.se">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIRAOOIoW9xqDSfIltHyx8Jm8YwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTExMTgwMDAwMDBaFw0xMjExMTcyMzU5NTlaMEkxCzAJBgNV
-BAYTAlNFMR8wHQYDVQQKExZTdG9ja2hvbG1zIHVuaXZlcnNpdGV0MRkwFwYDVQQD
-ExByb3VuZHVwLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyaa/LVY8eUxB/gK86emIR/C+7rG4sFaP7Jc3lNfRHQR/KmCdECwcQWShGsy1
-gnA2d5X7i/eXuWijk7dr7u5mVdCWrQ+rHBEE7DbX+9roDVIIM/eTDTo8HjpSX0pR
-3xmj8j33dJdjQUucdrfpx/1S1OwlvT7+Y5AqACyBoxH6XT4yGQHnxsPyK5JOBW1a
-S2DR3Fs3RDVkQjUFUZRdFey8YW2kmnIRKBAi1YTOi496wPpISovOmLASZZqVwMMF
-iDwLLWz6GbRvaPPa16kq9SQY2Bc4bNIqfEfXrOemqFmnvW4YUWxqAPaG1/qU3sRM
-2AW5eiGh3WYf0jC6rKHFmEY/vwIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKwiX0euXmkvdLT+lXwy8k4d+iCg
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEHJvdW5kdXAuaXQuc3Uuc2Uw
-DQYJKoZIhvcNAQEFBQADggEBABSYEIPbRorJTJHPaxXAwZU61CjKGSpTGOm6w1Eu
-kucMFRMFX+yxes/AmvgKNr+XcaWZcW1SYKd4FRIt2S6wghd0p1lMQBs2HGt6dNBO
-JDhCayjtfLhgSrAVc3aO8XLAdLqzBEL9FHHn0YJ489UL77+1qCtnt1KO4EWEHA7b
-TY93MXIatJgS0IpprD15gJ+2Tf2JEBMSv2Ne070GD/cpQ0S/mNhc0F8KZ9Dl+UBj
-TJFae2AdnxbUwP+Uyqgx3vA6xSEpHCezYy2f9KnDs77/AYQzFj2HTeyjS+CEfjfZ
-L3icoXenJnD8XOBe79BIPXkxxZCn+es6y1NoUK3d9U1iaEQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://roundup.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml b/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml
deleted file mode 100644
index 5f320eec..00000000
--- a/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-test.oru.se/shibboleth">
-  <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>shib-sp-test.oru.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-sp-test.oru.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=shib-sp-test.oru.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>15204698817365748467</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJANMB8QQ14yrzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWItc3AtdGVzdC5vcnUuc2UwHhcNMTAwNDE1MTEwNzM5WhcNMjAwNDEy
-MTEwNzM5WjAeMRwwGgYDVQQDExNzaGliLXNwLXRlc3Qub3J1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr41GEPTp07h+gL5wv55qutEqaR0Qb9Yx
-XEXu/ph7oXrRS0UbuLb5LyDgHNf9hIwMC5rd9oGWusyxvDhNXXKnP1PusqyqHYB8
-RfBPExrrLhqv9AJjuk15BGCoryeyuByCTBA3OwEp7p8Vv11lMGO52igSmrL/5tAU
-ijh9nKCJWdlV/GmRqidcUHOlN5k1MNnLZSr3VqpE2ixHBx+31EFlZvH2doisPl05
-EL9sjL3rpRL2JUx0R31UIkjs7WrHMge6fmaR8blYBiTbDr7td/Mw+jI1i/40iBT3
-6qqCDp0hzhFVQGL0wbCdjSA+Fko8/HC2WESYyR3wR0b98dynZYHq4QIDAQABo0Ew
-PzAeBgNVHREEFzAVghNzaGliLXNwLXRlc3Qub3J1LnNlMB0GA1UdDgQWBBTRhstJ
-XhYfb4dGIfqAMiMSrRN5cTANBgkqhkiG9w0BAQUFAAOCAQEApDbCA7x/ZrZbeBW6
-Ulnh93k61QHCEHUI7lTAYURbelbvTJCR13Wo2yK7VIhK83eGYcRPuJfaZFx8ILMp
-+ADWMEx4cdkG1aV0CrjRKy214pW1jtINOocaw/cI9T6XxyF6NQIRGrg0kcOjn/9B
-zIareRd4O9iioeVerfOY397kkP96U3osVhsPd4QuPMSQ0a3ixsMrK3U7KsrNb2ZU
-ehoMOCW85fFptZoo6VRtv7d+ivOBIDe+T4OwGmj0/KoCYT5iY4/047SRHWEtCQIO
-TqM7uwKSE3lL6DXewbrm2Nse+PXfS7odY/cCAdnHUompMNs468b6i/Eh7sC90QxV
-FJ5AlQ==
-</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>shib-sp-test.oru.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-sp-test.oru.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=shib-sp-test.oru.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>15204698817365748467</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJANMB8QQ14yrzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWItc3AtdGVzdC5vcnUuc2UwHhcNMTAwNDE1MTEwNzM5WhcNMjAwNDEy
-MTEwNzM5WjAeMRwwGgYDVQQDExNzaGliLXNwLXRlc3Qub3J1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr41GEPTp07h+gL5wv55qutEqaR0Qb9Yx
-XEXu/ph7oXrRS0UbuLb5LyDgHNf9hIwMC5rd9oGWusyxvDhNXXKnP1PusqyqHYB8
-RfBPExrrLhqv9AJjuk15BGCoryeyuByCTBA3OwEp7p8Vv11lMGO52igSmrL/5tAU
-ijh9nKCJWdlV/GmRqidcUHOlN5k1MNnLZSr3VqpE2ixHBx+31EFlZvH2doisPl05
-EL9sjL3rpRL2JUx0R31UIkjs7WrHMge6fmaR8blYBiTbDr7td/Mw+jI1i/40iBT3
-6qqCDp0hzhFVQGL0wbCdjSA+Fko8/HC2WESYyR3wR0b98dynZYHq4QIDAQABo0Ew
-PzAeBgNVHREEFzAVghNzaGliLXNwLXRlc3Qub3J1LnNlMB0GA1UdDgQWBBTRhstJ
-XhYfb4dGIfqAMiMSrRN5cTANBgkqhkiG9w0BAQUFAAOCAQEApDbCA7x/ZrZbeBW6
-Ulnh93k61QHCEHUI7lTAYURbelbvTJCR13Wo2yK7VIhK83eGYcRPuJfaZFx8ILMp
-+ADWMEx4cdkG1aV0CrjRKy214pW1jtINOocaw/cI9T6XxyF6NQIRGrg0kcOjn/9B
-zIareRd4O9iioeVerfOY397kkP96U3osVhsPd4QuPMSQ0a3ixsMrK3U7KsrNb2ZU
-ehoMOCW85fFptZoo6VRtv7d+ivOBIDe+T4OwGmj0/KoCYT5iY4/047SRHWEtCQIO
-TqM7uwKSE3lL6DXewbrm2Nse+PXfS7odY/cCAdnHUompMNs468b6i/Eh7sC90QxV
-FJ5AlQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml b/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml
deleted file mode 100644
index e200e851..00000000
--- a/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.sys.kth.se/identity">
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIB6TCCAVKgAwIBAgIJAOWxnEiImxnuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTAeFw0wODAyMDcwMDI4MDFaFw0xMTAyMDYwMDI4MDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsoH589Je8tY9QKR4fdR5IMw+EOAsGNETKCdap9hqbSKSX5cG8xsJ3wjgxwbe9LbiboKk8GwxU/iSuxtzIa+myfeFkgL/IR0En6lyFvPnJxcNOV2fAVlForH2OPrt/WxeP9AzkzyjzrjOtH6mi4pT7jiHjxKWX7L6vB7rgyTJjHsCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB3Ktsl6UYCV5YRwJ/gnHndiiUR/kOdaJaC0sv5C1f+uNdBGxJqz6h8W4rKXv6B4m/oDyZY0P7GYY1bZ2fMTnTfVF5MsCscURIIHz8bo+/LoYp/fRQSm/AG2Xz3vJFEMFtKXoGvi9VgcSS1BoBAn2I9oxZTNmTxlmkocYMYXdMopA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sys.kth.se:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIB6TCCAVKgAwIBAgIJAOWxnEiImxnuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTAeFw0wODAyMDcwMDI4MDFaFw0xMTAyMDYwMDI4MDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsoH589Je8tY9QKR4fdR5IMw+EOAsGNETKCdap9hqbSKSX5cG8xsJ3wjgxwbe9LbiboKk8GwxU/iSuxtzIa+myfeFkgL/IR0En6lyFvPnJxcNOV2fAVlForH2OPrt/WxeP9AzkzyjzrjOtH6mi4pT7jiHjxKWX7L6vB7rgyTJjHsCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB3Ktsl6UYCV5YRwJ/gnHndiiUR/kOdaJaC0sv5C1f+uNdBGxJqz6h8W4rKXv6B4m/oDyZY0P7GYY1bZ2fMTnTfVF5MsCscURIIHz8bo+/LoYp/fRQSm/AG2Xz3vJFEMFtKXoGvi9VgcSS1BoBAn2I9oxZTNmTxlmkocYMYXdMopA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sys.kth.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sys.kth.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Institute of Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Royal Institute of Technology</Company>
-    <EmailAddress>jbn@kth.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml b/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml
deleted file mode 100644
index c34cb206..00000000
--- a/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.dreamspark.com/shibboleth-sp">
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>staging.dreamspark.com</ds:KeyName>
-        <ds:X509Data>
-          <!-- Serial No. 435, expires on Mon Sep 20 18:11:20 2010 GMT -->
-          <ds:X509Certificate>MIIFGTCCBAGgAwIBAgICAb4wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MTAwNjE4MTQwNVoXDTEwMTAw
-NzE4MTQwNVowITEfMB0GA1UEAxMWc3RhZ2luZy5kcmVhbXNwYXJrLmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvyt5Coj3UzRIAN4AMxfkCOJfldddhJjg
-7PEe/9HnY0GnXs3QExkFKoaLqdVa6BbGg8p5iOJvJ+hN8KW8rlEOdUaVhmPdE6y3
-ZHnErru6kmwwV/sFPQEqfsFKhENe7scfgfcMl4jx53PUkAn84itc1LSPhbJfsALu
-HurV5Nwk0+cCAwEAAaOCAqgwggKkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUrQqs
-L1PyXk/vJ7oK+EACxDjcpwUwfgYDVR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufK
-Y0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0
-aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIB
-ADCBsgYIKwYBBQUHAQEEgaUwgaIwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1v
-bmNhMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0
-cy5wN2IwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZl
-ZGVyYXRpb24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSB
-hTCBgjA/oD2gO4Y5aHR0cDovL2luY29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2NybC9lZWNybHMuY3JsMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwy
-LmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcw
-VTBTBgsrBgEEAa4jAQQBATBEMEIGCCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25j
-YS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL3ByYWN0aWNlcy5wZGYwIQYDVR0RBBow
-GIIWc3RhZ2luZy5kcmVhbXNwYXJrLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAgFob
-QMnMr7WedSIrpSek0jZoGdwW+Ih2y2ZaNP96ygFyIZTxnYDbY4wGoVPDbA+1uGew
-MoOigJlZkBeJyinRCAaOjRaOWAU91JxtJi/4kZrJbPDY8djyCbfSRAEXUSAPuBwx
-PBUwwjoz57LnhrgSNNU6X20uGOpzt9IYmcujZ/7t5P9u8/tzVBOpa62QAgFJVBwD
-Ucr+wB3H3RDSF0kBH94nAgOPXJToHWJM7gcOr+m8AEEI1YukftZVrwE9/3cI7SPe
-eEW5lxwrxpzVESmLHCr+HpdOsZqG6B4Nrt6UjjI9jB1rguPXKBjfUw7YAeCwx7jT
-05NcwImw3Hy1xQdZqQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.dreamspark.com/Shibboleth.sso/SAML/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Microsoft</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>DreamSpark Engineering Team</GivenName>
-    <EmailAddress>dsengt@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Scott Blackwell</GivenName>
-    <EmailAddress>Scott.Blackwell@microsoft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml b/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml
deleted file mode 100644
index f943c860..00000000
--- a/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vhs-shib.no-ip.org/shibboleth-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>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
-MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
-J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
-2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
-vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
-hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
-BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
-VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
-LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
-9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
-+CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
-1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
-Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
-OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
-wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
-MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
-J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
-2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
-vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
-hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
-BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
-VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
-LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
-9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
-+CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
-1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
-Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
-OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
-wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.student.teol.uu.se.xml b/swamid-2.0-obsolete/www.student.teol.uu.se.xml
deleted file mode 100644
index 3b452497..00000000
--- a/swamid-2.0-obsolete/www.student.teol.uu.se.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.student.teol.uu.se">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gravis.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gravis.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOCYEsltDIEOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGdyYXZpcy5pdHMudXUuc2UwHhcNMTEwNTMwMTE0MjQ0WhcNMjEwNTI3MTE0
-MjQ0WjAbMRkwFwYDVQQDExBncmF2aXMuaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqcyKimtM4p/GlAzooApIxPv+/BHyzyJh8gGcLFnH
-XNq/t1eZz1MAFeSg5nWYwCp2VaVSEGGy/C711qeSgCONkl83E4KFrsfjhT4OAgST
-N0MlNscx1bFy/xhY8auGzCO06vtyjo0KAV3b0dJHLdkVPqnZ2adh5NrBW8W+UjuF
-YlkVloBNbtYFkmDJ9TdDRR0lHn9kc8XBsc+tNWRiY8dnbrqrjEi9dhvu329htBKy
-jaXaX7XYO/N3m4bfTv2iLL6LmdIUOldSFg0+hk6haFsexfcpjNXmYW6TOdqEwRKO
-P3WaH3Nw0yfJVWFKiniy6g775F+QXs5PzxlNcLK+jkCOkQIDAQABoz4wPDAbBgNV
-HREEFDASghBncmF2aXMuaXRzLnV1LnNlMB0GA1UdDgQWBBRzUaO3NftSgdTOeqmN
-vB3AFMLi8TANBgkqhkiG9w0BAQUFAAOCAQEAh8KlaKp/LGgJL2w8/ES3nYhEXT6P
-Gy6V4RfqYCq0MKrel66XvB/3Q5F9+yoA39DjXFAVaZUB3xI0WeoHorQ7Gx+59gij
-xr6eFVgxL7j7q/dW48sz7tZwZ2znx0ML3LQY4z4Xqq0fGW7o+EsMby27IyM7C3Uk
-ch5H5bJ6FWyiKsG1aH9ZHQHGXKbDbCOL7eO3CEZFj10UWeETomBGBsE0YAwMgOKh
-4ZTYqvTaF7H9YYOOET3DeNeyk9LyhwQmHBkj9qfoA076qW58vWT5JxgOowHhf8Q5
-gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml b/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml
deleted file mode 100644
index 4ced63eb..00000000
--- a/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.nu/shibboleth-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.nu/shibboleth-sp</ds:KeyName>
-        <ds:KeyName>www.studera.nu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.nu</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAIUfzx/N0lN8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDnd3dy5zdHVkZXJhLm51MB4XDTEwMTEyNDExNTI0MFoXDTE1MTEyMzExNTI0
-MFowGTEXMBUGA1UEAxMOd3d3LnN0dWRlcmEubnUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCrF/v2Tcx6XNgANqYzUpibkBjhMjmpWAr67h4vQvpPUabI
-C2i/pxTykjPU7RPuako391Th4PR0pCDD21odCDShbcxEL6fy7CecWj2baI5antu7
-gx2bj6/y1k6V4c6c+it+VsU30usG3teYVNWaoAYk6FJuymS8zXSTvyihFlRr9l8P
-oV0Ap5IaBK7fj9sjESreefpv8a1/V0YXKvuJi9YdTAj7k3C0lj8/DiC/suXy+X/+
-/b9a6oEu1Gb8aPdxu7upq+C2A9RIebr2JtbqLwo5luQEIz2UMVUlR5SP1oGdo9jZ
-oo/rRNSNXsBKlkNgSUSBfKdnnDuKiBlgC6MwOvhbAgMBAAGjYjBgMD8GA1UdEQQ4
-MDaCDnd3dy5zdHVkZXJhLm51hiRodHRwczovL3d3dy5zdHVkZXJhLm51L3NoaWJi
-b2xldGgtc3AwHQYDVR0OBBYEFFtvzM/pgvj1lvMsm/h3rQZwmYMJMA0GCSqGSIb3
-DQEBBQUAA4IBAQCkQBRKL0sVMPL72omwGG6HI+Fv2Tyy2SrgODKvg5jjYBe70WfB
-s08Nmrl2ASDVvdsPEadmlyeQMqol7QfavTHK0+bu4j/2H0+ezhsNrADrTPs52k0k
-MpfZcKxrHEBzfVXA+MWl3yyGBoqCo9iXMU62UiNkxj71+1/ZGDOlttPUaZlYXi0f
-O/SLBF07IJZ2k+n5N4IpwIp8Yr5+vRMMqPEHDc7qVQ33Qp3VZN/vxFOj7DVUMAMt
-7K0x1uPKTp7929lYXfYsgLtQtV0FRrldiF/qN8y0qElNUyynhyQB38gJcTCbUzIX
-To0ucpLgYZwm1LIEXh4+VZuM2irCpX+guvFa
-</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.nu/shibboleth-sp</ds:KeyName>
-        <ds:KeyName>www.studera.nu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.nu</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAIUfzx/N0lN8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDnd3dy5zdHVkZXJhLm51MB4XDTEwMTEyNDExNTI0MFoXDTE1MTEyMzExNTI0
-MFowGTEXMBUGA1UEAxMOd3d3LnN0dWRlcmEubnUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCrF/v2Tcx6XNgANqYzUpibkBjhMjmpWAr67h4vQvpPUabI
-C2i/pxTykjPU7RPuako391Th4PR0pCDD21odCDShbcxEL6fy7CecWj2baI5antu7
-gx2bj6/y1k6V4c6c+it+VsU30usG3teYVNWaoAYk6FJuymS8zXSTvyihFlRr9l8P
-oV0Ap5IaBK7fj9sjESreefpv8a1/V0YXKvuJi9YdTAj7k3C0lj8/DiC/suXy+X/+
-/b9a6oEu1Gb8aPdxu7upq+C2A9RIebr2JtbqLwo5luQEIz2UMVUlR5SP1oGdo9jZ
-oo/rRNSNXsBKlkNgSUSBfKdnnDuKiBlgC6MwOvhbAgMBAAGjYjBgMD8GA1UdEQQ4
-MDaCDnd3dy5zdHVkZXJhLm51hiRodHRwczovL3d3dy5zdHVkZXJhLm51L3NoaWJi
-b2xldGgtc3AwHQYDVR0OBBYEFFtvzM/pgvj1lvMsm/h3rQZwmYMJMA0GCSqGSIb3
-DQEBBQUAA4IBAQCkQBRKL0sVMPL72omwGG6HI+Fv2Tyy2SrgODKvg5jjYBe70WfB
-s08Nmrl2ASDVvdsPEadmlyeQMqol7QfavTHK0+bu4j/2H0+ezhsNrADrTPs52k0k
-MpfZcKxrHEBzfVXA+MWl3yyGBoqCo9iXMU62UiNkxj71+1/ZGDOlttPUaZlYXi0f
-O/SLBF07IJZ2k+n5N4IpwIp8Yr5+vRMMqPEHDc7qVQ33Qp3VZN/vxFOj7DVUMAMt
-7K0x1uPKTp7929lYXfYsgLtQtV0FRrldiF/qN8y0qElNUyynhyQB38gJcTCbUzIX
-To0ucpLgYZwm1LIEXh4+VZuM2irCpX+guvFa
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.nu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.nu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nu/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.nu/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.nu/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nu/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nu/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.nu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.nu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.nu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.nu/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www2.student.teol.uu.se.xml b/swamid-2.0-obsolete/www2.student.teol.uu.se.xml
deleted file mode 100644
index b37209df..00000000
--- a/swamid-2.0-obsolete/www2.student.teol.uu.se.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.student.teol.uu.se">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www2.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www2.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gravis.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gravis.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOCYEsltDIEOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGdyYXZpcy5pdHMudXUuc2UwHhcNMTEwNTMwMTE0MjQ0WhcNMjEwNTI3MTE0
-MjQ0WjAbMRkwFwYDVQQDExBncmF2aXMuaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqcyKimtM4p/GlAzooApIxPv+/BHyzyJh8gGcLFnH
-XNq/t1eZz1MAFeSg5nWYwCp2VaVSEGGy/C711qeSgCONkl83E4KFrsfjhT4OAgST
-N0MlNscx1bFy/xhY8auGzCO06vtyjo0KAV3b0dJHLdkVPqnZ2adh5NrBW8W+UjuF
-YlkVloBNbtYFkmDJ9TdDRR0lHn9kc8XBsc+tNWRiY8dnbrqrjEi9dhvu329htBKy
-jaXaX7XYO/N3m4bfTv2iLL6LmdIUOldSFg0+hk6haFsexfcpjNXmYW6TOdqEwRKO
-P3WaH3Nw0yfJVWFKiniy6g775F+QXs5PzxlNcLK+jkCOkQIDAQABoz4wPDAbBgNV
-HREEFDASghBncmF2aXMuaXRzLnV1LnNlMB0GA1UdDgQWBBRzUaO3NftSgdTOeqmN
-vB3AFMLi8TANBgkqhkiG9w0BAQUFAAOCAQEAh8KlaKp/LGgJL2w8/ES3nYhEXT6P
-Gy6V4RfqYCq0MKrel66XvB/3Q5F9+yoA39DjXFAVaZUB3xI0WeoHorQ7Gx+59gij
-xr6eFVgxL7j7q/dW48sz7tZwZ2znx0ML3LQY4z4Xqq0fGW7o+EsMby27IyM7C3Uk
-ch5H5bJ6FWyiKsG1aH9ZHQHGXKbDbCOL7eO3CEZFj10UWeETomBGBsE0YAwMgOKh
-4ZTYqvTaF7H9YYOOET3DeNeyk9LyhwQmHBkj9qfoA076qW58vWT5JxgOowHhf8Q5
-gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml b/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml
deleted file mode 100644
index 8ffa9fb0..00000000
--- a/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xenosmilus2.umdc.umu.se:8085/sp.xml">
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8085/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>
-                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
-                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
-                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
-                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
-                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
-                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
-                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
-                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
-                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
-                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
-                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
-                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
-                    </ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>
-                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
-                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
-                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
-                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
-                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
-                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
-                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
-                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
-                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
-                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
-                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
-                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
-                    </ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8085/slo"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8085" index="1"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">ITS, Umea University</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="se">ITS@UMU</ns0:OrganizationDisplayName>
-    <ns0:OrganizationDisplayName xml:lang="en">ITS@UMU</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.its.umu.se/roland</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Roland</ns0:GivenName>
-    <ns0:SurName>Hedberg</ns0:SurName>
-    <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>