NyA/Ladok3 IdP:s/SP:s at ITS obsolete

author: Fredrik Åslund <fredrik.aslund@umu.se> 2013-09-24 10:50:01 +0200
committer: Fredrik Åslund <fredrik.aslund@umu.se> 2013-09-24 10:50:01 +0200
commit: 9ee70fb18dcf445d7b4e1690e0999bd0736ef5ba (patch)
tree: 02f78a7ab6e9bce9b929b09a87ed4252801e278b
parent: 29d2096ba1866e8c5b070dcfa1d590f672051ab2 (diff)
381 files changed, 0 insertions, 19952 deletions
diff --git a/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 3f9f3991..00000000
--- a/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft10.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIJAI0Ak//aNy/fMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTAubGFkb2sudW11LnNlMB4XDTEwMDQwODEzNTQxN1oXDTIwMDQwNTEzNTQxN1owHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxp4GiuW3utBqmBCv2V556oqGsvc6YHoPl5q9VGcXziVGxlA1D5UB2JN9WJjcxCXLc0LY0ac6rNceP4eICHEhwNOFkXu2RzTq7d7oSbqUZhmVsZXYYKou4IpBI6h9deXBcOV+tiOebF7kehXHb4PY2sfVBLIFRq8hAG3Y9TPMVHhpC2TdAeBl+C3/Daia41YKF+vc7F2ZtQcxBeD0/NB+BjhnhCcFM9JzgTu34R5rGiQL7+n3pxbl4FEbaqyGFaywn/mwCvdRNfkFrFppqnXPhGckky7nxyr1Gc43t1Ch5arUnhPLwiSHRAj4uVPvkHdUisJ13b5qXnBYmlDr7QR4tAgMBAAGjfTB7MB0GA1UdDgQWBBT9/fMaoR07yLfN15nj9pzO9EbhRTBMBgNVHSMERTBDgBT9/fMaoR07yLfN15nj9pzO9EbhRaEgpB4wHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2WCCQCNAJP/2jcv3zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDJ1YAr17AOiEqmKkEeENksTZz038FNB+EHFYVT8iDyb4xPBOc9Z4H9SidSQ48/ngd9N0upsvA2FkLJP66lyRCt6Tj//EVvgM1AcmyYP6XjdEFTDQUAUDeAexmoB63r5kQ6tzGLnVX9fvO3MOo0gIGwKRG6ofN+MuwxARXMRbehJ4V11TKri7yi74iaJ3U5LpmjKBvOmZd7s1V/EEeQatnSvdfYieFeGmFjgbbcJT8IJqJC5bGYkQjNlKpLyrxye3V/0tg47rbarLWF2K9F173TEV+Tpu3Sw8E9oawpENAa1bYiEmd6gB/pxErjbBQY+P98ZHc9ClfZADCUOT4zJHMd
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft10.ladok.umu.se:444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIJAI0Ak//aNy/fMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTAubGFkb2sudW11LnNlMB4XDTEwMDQwODEzNTQxN1oXDTIwMDQwNTEzNTQxN1owHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxp4GiuW3utBqmBCv2V556oqGsvc6YHoPl5q9VGcXziVGxlA1D5UB2JN9WJjcxCXLc0LY0ac6rNceP4eICHEhwNOFkXu2RzTq7d7oSbqUZhmVsZXYYKou4IpBI6h9deXBcOV+tiOebF7kehXHb4PY2sfVBLIFRq8hAG3Y9TPMVHhpC2TdAeBl+C3/Daia41YKF+vc7F2ZtQcxBeD0/NB+BjhnhCcFM9JzgTu34R5rGiQL7+n3pxbl4FEbaqyGFaywn/mwCvdRNfkFrFppqnXPhGckky7nxyr1Gc43t1Ch5arUnhPLwiSHRAj4uVPvkHdUisJ13b5qXnBYmlDr7QR4tAgMBAAGjfTB7MB0GA1UdDgQWBBT9/fMaoR07yLfN15nj9pzO9EbhRTBMBgNVHSMERTBDgBT9/fMaoR07yLfN15nj9pzO9EbhRaEgpB4wHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2WCCQCNAJP/2jcv3zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDJ1YAr17AOiEqmKkEeENksTZz038FNB+EHFYVT8iDyb4xPBOc9Z4H9SidSQ48/ngd9N0upsvA2FkLJP66lyRCt6Tj//EVvgM1AcmyYP6XjdEFTDQUAUDeAexmoB63r5kQ6tzGLnVX9fvO3MOo0gIGwKRG6ofN+MuwxARXMRbehJ4V11TKri7yi74iaJ3U5LpmjKBvOmZd7s1V/EEeQatnSvdfYieFeGmFjgbbcJT8IJqJC5bGYkQjNlKpLyrxye3V/0tg47rbarLWF2K9F173TEV+Tpu3Sw8E9oawpENAa1bYiEmd6gB/pxErjbBQY+P98ZHc9ClfZADCUOT4zJHMd
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">studera.nu</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">studera.nu (ft10)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Umeå university</Company>
-    <EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml
deleted file mode 100644
index 764c6527..00000000
--- a/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft10.ladok.umu.se/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: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://ft10.ladok.umu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft10</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft10</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAKXYiyKgoRIwMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBGZ0MTAwHhcNMTAwMzI5MjEwNDExWhcNMjAwMzI2MjEwNDExWjAPMQ0wCwYD
-VQQDEwRmdDEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3JRFv0tI
-AmWbQGB3nh/isslbrpsMyd3/71L8jVaDE7oM1Z+6lw7wFEoHvi5aIuEWX+wZH+Qz
-Tvas1ph4XwITIgWuw3has2+VTrV7CRd9j+VZqI89AD0WZb2A9i+YGtW+uu97g2Ge
-y610GdNyN6CVx1+/9yMQ2xG1NWnT2zFsyo/FNXFW7868zpVwnSFJj1HsBjn1mX11
-5iLRR2aKvI401PnDTDa17SO/oEHY1BN20lMiRkvy2fNnXOGgnmgnq1QUzkM+zq0O
-WPcxgBiJNMgF7oqofngEe7Aj4aUgdvftKZ3NWQqVT4ooX5zP6oOc2La/DrjKn7rZ
-r6oZCmDulHooYwIDAQABozIwMDAPBgNVHREECDAGggRmdDEwMB0GA1UdDgQWBBTh
-RU7zm4zArzyFQ/g3Wn+hQUUlEjANBgkqhkiG9w0BAQUFAAOCAQEAt8dwBFQvBDK7
-SwpZm23Yp6RPn6v5TrEMZB7bqY1uzsNav9jR8lJF+eGXFnSGzEsXlzqMqQDRSgm4
-FfYm+IwQfts+/uCClZbN4JqPS/HG3hR9eUx3dEAIcEFifmXiTUYX/Y8FaIrCT78x
-+tc4bM12ZW6u/Dmdwc4VAJnaPoQa4n3cxRPgt5L2pSt5mgefJYAHaolg05U6RwB3
-pMe6RhCajPyyfKswPKOLf+eLBAa/0s98G6xepCoQYcb/IqxFIUSP2JhuMOOjnA1E
-kyW+UIfRS0B8rBKhspXYi5GIT+SQpJbLqfm7hvKo2IEQ+Xqc4JGmqD+Xivn7OpHB
-5CNmPfwS7A==
-</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>ft10</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft10</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAKXYiyKgoRIwMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBGZ0MTAwHhcNMTAwMzI5MjEwNDExWhcNMjAwMzI2MjEwNDExWjAPMQ0wCwYD
-VQQDEwRmdDEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3JRFv0tI
-AmWbQGB3nh/isslbrpsMyd3/71L8jVaDE7oM1Z+6lw7wFEoHvi5aIuEWX+wZH+Qz
-Tvas1ph4XwITIgWuw3has2+VTrV7CRd9j+VZqI89AD0WZb2A9i+YGtW+uu97g2Ge
-y610GdNyN6CVx1+/9yMQ2xG1NWnT2zFsyo/FNXFW7868zpVwnSFJj1HsBjn1mX11
-5iLRR2aKvI401PnDTDa17SO/oEHY1BN20lMiRkvy2fNnXOGgnmgnq1QUzkM+zq0O
-WPcxgBiJNMgF7oqofngEe7Aj4aUgdvftKZ3NWQqVT4ooX5zP6oOc2La/DrjKn7rZ
-r6oZCmDulHooYwIDAQABozIwMDAPBgNVHREECDAGggRmdDEwMB0GA1UdDgQWBBTh
-RU7zm4zArzyFQ/g3Wn+hQUUlEjANBgkqhkiG9w0BAQUFAAOCAQEAt8dwBFQvBDK7
-SwpZm23Yp6RPn6v5TrEMZB7bqY1uzsNav9jR8lJF+eGXFnSGzEsXlzqMqQDRSgm4
-FfYm+IwQfts+/uCClZbN4JqPS/HG3hR9eUx3dEAIcEFifmXiTUYX/Y8FaIrCT78x
-+tc4bM12ZW6u/Dmdwc4VAJnaPoQa4n3cxRPgt5L2pSt5mgefJYAHaolg05U6RwB3
-pMe6RhCajPyyfKswPKOLf+eLBAa/0s98G6xepCoQYcb/IqxFIUSP2JhuMOOjnA1E
-kyW+UIfRS0B8rBKhspXYi5GIT+SQpJbLqfm7hvKo2IEQ+Xqc4JGmqD+Xivn7OpHB
-5CNmPfwS7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 2480663f..00000000
--- a/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb10.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0xMDAyMTExNTIyMzRaFw0yMDAyMDkxNTIyMzRaMA4xDDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOp/Esl7gtsEeVP2c6s4HRMdLiy17FiqnVUShnaHIKtjXXxvWjBFvPcyKTyQeFxT9Kg1TjTrUed4DSnxefb7xPy/KqryfbheBzHbuLnEuv9EoMsOHbLvNY/FMFUidPcZhvpQq9yydpS62UY41EHDasywndoImIfvda5frHBTAs8+DlXPvHUWKsIFGssw5WCx5KpGspWgfWTlAVLAEA5EaDKKGhjRb+PgzVyjCLK6umrsOUhCcorC7c3Fp+aFJW0pO3wNGguUoLObJ4yazpENvuWQGUpfWFpS5E1jSeHqu66VYH+iFBxiP6PZ/Ikd2u+XT0Aj+9ye7cknD+LKXoLvCYECAwEAAaNvMG0wHQYDVR0OBBYEFIW+FvQoNa3MdXkHiigNh+ZyLhajMD4GA1UdIwQ3MDWAFIW+FvQoNa3MdXkHiigNh+ZyLhajoRKkEDAOMQwwCgYDVQQDEwNpZHCCCQDKTpixwAEOWzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfKIYeeE+X7YNbIp2NKTuR2wSgPT3j3iGXzQ9RXf+ntZVes4WNZaGx3aEG1C7Ku96CgGoewngvwM4cWMECTRTX82lWCK3ef4/Ds3uoqb/nDw+pz1UZcgyhyurfPyhPbvHxkpT19X+2MQovgYvtBLMeAqzjmYI+wWoWT/+i6blv81nEOLhR/V95KXSlzxcNVCBMM5p5AjohFT/XcaGM8X7oYT+pUcFmaLX4F5UbwIIMjvDmZSK10Ms9U+sIBTWbcW43m81wFA/xDPJ5/jTo3jF5J5nS9Uncn4asFYAPZcouSXzQO3nwrMWMvBv23STOgMvnb74zI630Rc6p3QJzP3EM
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0xMDAyMTExNTIyMzRaFw0yMDAyMDkxNTIyMzRaMA4xDDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOp/Esl7gtsEeVP2c6s4HRMdLiy17FiqnVUShnaHIKtjXXxvWjBFvPcyKTyQeFxT9Kg1TjTrUed4DSnxefb7xPy/KqryfbheBzHbuLnEuv9EoMsOHbLvNY/FMFUidPcZhvpQq9yydpS62UY41EHDasywndoImIfvda5frHBTAs8+DlXPvHUWKsIFGssw5WCx5KpGspWgfWTlAVLAEA5EaDKKGhjRb+PgzVyjCLK6umrsOUhCcorC7c3Fp+aFJW0pO3wNGguUoLObJ4yazpENvuWQGUpfWFpS5E1jSeHqu66VYH+iFBxiP6PZ/Ikd2u+XT0Aj+9ye7cknD+LKXoLvCYECAwEAAaNvMG0wHQYDVR0OBBYEFIW+FvQoNa3MdXkHiigNh+ZyLhajMD4GA1UdIwQ3MDWAFIW+FvQoNa3MdXkHiigNh+ZyLhajoRKkEDAOMQwwCgYDVQQDEwNpZHCCCQDKTpixwAEOWzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfKIYeeE+X7YNbIp2NKTuR2wSgPT3j3iGXzQ9RXf+ntZVes4WNZaGx3aEG1C7Ku96CgGoewngvwM4cWMECTRTX82lWCK3ef4/Ds3uoqb/nDw+pz1UZcgyhyurfPyhPbvHxkpT19X+2MQovgYvtBLMeAqzjmYI+wWoWT/+i6blv81nEOLhR/V95KXSlzxcNVCBMM5p5AjohFT/XcaGM8X7oYT+pUcFmaLX4F5UbwIIMjvDmZSK10Ms9U+sIBTWbcW43m81wFA/xDPJ5/jTo3jF5J5nS9Uncn4asFYAPZcouSXzQO3nwrMWMvBv23STOgMvnb74zI630Rc6p3QJzP3EM
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml
deleted file mode 100644
index 09765aea..00000000
--- a/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb10.ladok.umu.se/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>nb10</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb10</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAPZ7n1Rwjq+5MA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBG5iMTAwHhcNMTAwMzI2MTYxMjA0WhcNMjAwMzIzMTYxMjA0WjAPMQ0wCwYD
-VQQDEwRuYjEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJmbPVnm
-VHTONxF4zwYYFGe25BD7zRUNnODV3KPGybF0EM91hLyH4qPmucdnVmVkllMJym/N
-yRd0VNGmfEehlPWpUoBw5jYjTauncDJgbdApfRb6uZtPoVECI7+2BaArVMZoDBaF
-v0suy7jmASEx1WoxXRJg1uKb1oHk6jYSVgDKmEDHz93l/6b2zjEqBdOZ5qOjyv/c
-WVJXtzWgOwho8ZNfz9J2P8biFruhzpv/tf9QR+80nLY8hD2iCJ1jasuoQUCsw+fM
-Cgul/exYNFHkU+PSIn/uF8IIueD8xkUPehjhPI3uDmvYf8dnU+YLAHuGKLdRVpH6
-+Cl4j7cugnu/UwIDAQABozIwMDAPBgNVHREECDAGggRuYjEwMB0GA1UdDgQWBBSQ
-wLix1r/0hsD4AqIz/3mWa1dbSDANBgkqhkiG9w0BAQUFAAOCAQEAZ9jKPHbRKSn7
-Ybz3ORxnw12vgOr5RoN82ITZGMylpJdSnuCC101wh+L5baa6YPZB+vh2yJRiys9j
-BGyT1Y0mHFxPrScsL8oJfX3wZJBFXkj1x1xGD5VzPae4KnkPdTig0hc0/bWTu+HU
-U19KXjxXlZj66d+fEyuqTf6M8AYWnkae1UCIEeABCKOskpbcq7HRJYYsxLOhJR2g
-JMGziVsjtffaPKOaFXMYWr3U3qF6P1j0XtgHec7mpOdqEjvzFXa67TXrogbPsrb+
-NzDd6GwWzSIZYROepS6fiAPNL/WwoKNRzbOl2j2Bm69N4w9Pa7Vuf4VxooBSnmpW
-KyI1tqS2gQ==
-</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>nb10</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb10</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAPZ7n1Rwjq+5MA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBG5iMTAwHhcNMTAwMzI2MTYxMjA0WhcNMjAwMzIzMTYxMjA0WjAPMQ0wCwYD
-VQQDEwRuYjEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJmbPVnm
-VHTONxF4zwYYFGe25BD7zRUNnODV3KPGybF0EM91hLyH4qPmucdnVmVkllMJym/N
-yRd0VNGmfEehlPWpUoBw5jYjTauncDJgbdApfRb6uZtPoVECI7+2BaArVMZoDBaF
-v0suy7jmASEx1WoxXRJg1uKb1oHk6jYSVgDKmEDHz93l/6b2zjEqBdOZ5qOjyv/c
-WVJXtzWgOwho8ZNfz9J2P8biFruhzpv/tf9QR+80nLY8hD2iCJ1jasuoQUCsw+fM
-Cgul/exYNFHkU+PSIn/uF8IIueD8xkUPehjhPI3uDmvYf8dnU+YLAHuGKLdRVpH6
-+Cl4j7cugnu/UwIDAQABozIwMDAPBgNVHREECDAGggRuYjEwMB0GA1UdDgQWBBSQ
-wLix1r/0hsD4AqIz/3mWa1dbSDANBgkqhkiG9w0BAQUFAAOCAQEAZ9jKPHbRKSn7
-Ybz3ORxnw12vgOr5RoN82ITZGMylpJdSnuCC101wh+L5baa6YPZB+vh2yJRiys9j
-BGyT1Y0mHFxPrScsL8oJfX3wZJBFXkj1x1xGD5VzPae4KnkPdTig0hc0/bWTu+HU
-U19KXjxXlZj66d+fEyuqTf6M8AYWnkae1UCIEeABCKOskpbcq7HRJYYsxLOhJR2g
-JMGziVsjtffaPKOaFXMYWr3U3qF6P1j0XtgHec7mpOdqEjvzFXa67TXrogbPsrb+
-NzDd6GwWzSIZYROepS6fiAPNL/WwoKNRzbOl2j2Bm69N4w9Pa7Vuf4VxooBSnmpW
-KyI1tqS2gQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml b/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 0f0986cc..00000000
--- a/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testc.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testc.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPJ+RSRFDZVSMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvB
-ef9KGfHjxdiXolyEYN6Lcp5yNDQI6tS/rNGIHbK75c805M5V5uzHPdWLnfZ/6RwI
-mLR+SCOs5+yKTJjDr0FflH0jQ/5At3Vg9oHv0DaylZscxR3qmdj48R+AbVUcav77
-/U8mEELUoVGgLKesYA1SybNgcGzV+Sgxk6ar5Bq7ZDWlOagbjSaiZDxBbxfsGFIW
-K9z8gj3Wy9gsy3otamBZ7nELph0M8ZIPKMMLoiOKKxpfLFK2QD/zcMf8y61b0fXd
-RubXATsPXn65K7g1PCV95zA1O8VWn1/dC1nSlmltD3zziAX56xgCqn7PsfsCH7CI
-CrxzEejyocRhGDz2Hd0CAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
-ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFAORRbDHuUZ+3r+9Z8moX6SvshEg
-MA0GCSqGSIb3DQEBBQUAA4IBAQC1kEUv/dbEYDBdElLOPLZEwyYrq4wHbyLSqZ6X
-no76seNckzcvHhoPof73wL9uu+8YfLx2yT+BC9m9Ved7DU1PnKZ/lYoHo0IQrZ5B
-49wmIXDvX03wP9siMT9Yz4cSeok8IpVHoGWDco7UI0/jTRfN7tx5EP+2PFWqtqCa
-oR+sJFzuRkaYceu1DmJLscMX4J10IEWvXXJ+CrdnKvXbXj5aarkCYqPjRfnUjzPQ
-oGfYJqbgeae5WMcYZFsrH0vDgsV4JI/ihVFKtG19BEk4T0RepVkzHIg2cwKBRRIu
-LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testc.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPJ+RSRFDZVSMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvB
-ef9KGfHjxdiXolyEYN6Lcp5yNDQI6tS/rNGIHbK75c805M5V5uzHPdWLnfZ/6RwI
-mLR+SCOs5+yKTJjDr0FflH0jQ/5At3Vg9oHv0DaylZscxR3qmdj48R+AbVUcav77
-/U8mEELUoVGgLKesYA1SybNgcGzV+Sgxk6ar5Bq7ZDWlOagbjSaiZDxBbxfsGFIW
-K9z8gj3Wy9gsy3otamBZ7nELph0M8ZIPKMMLoiOKKxpfLFK2QD/zcMf8y61b0fXd
-RubXATsPXn65K7g1PCV95zA1O8VWn1/dC1nSlmltD3zziAX56xgCqn7PsfsCH7CI
-CrxzEejyocRhGDz2Hd0CAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
-ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFAORRbDHuUZ+3r+9Z8moX6SvshEg
-MA0GCSqGSIb3DQEBBQUAA4IBAQC1kEUv/dbEYDBdElLOPLZEwyYrq4wHbyLSqZ6X
-no76seNckzcvHhoPof73wL9uu+8YfLx2yT+BC9m9Ved7DU1PnKZ/lYoHo0IQrZ5B
-49wmIXDvX03wP9siMT9Yz4cSeok8IpVHoGWDco7UI0/jTRfN7tx5EP+2PFWqtqCa
-oR+sJFzuRkaYceu1DmJLscMX4J10IEWvXXJ+CrdnKvXbXj5aarkCYqPjRfnUjzPQ
-oGfYJqbgeae5WMcYZFsrH0vDgsV4JI/ihVFKtG19BEk4T0RepVkzHIg2cwKBRRIu
-LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml b/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index f621984e..00000000
--- a/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testd.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testd.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANp8PNQfoLNyMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MDhaFw0yMDA5MTQxNDUyMDhaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9
-bNdjjH8LoeCSVdvTQhF9I2ova5M2td2yrGvlaz2AzK59rCcOJwaJMysp0IieO8vV
-l3I1MQjlahh5OWXNqZO5+o6OQzfF/0K3kwrA067Shm+99a8Arz/UdEuT6ykNzizP
-7DGyp5Pe2lNlHCWa3HJQJoDbFU+x7cAuV2WkUl04DTyP8LRaLD1+NRoiRtsEUDm5
-ag3f5u3hJV1zYF3v/dlRldDUTfkQMEjhdg1QLxYDeDFojiI2NHjvSomw1uTeKE14
-Ktfgmc3O4slBpPTwJuxtUrw3STTqnV5R2h2JtzTMsidtRlMVugglKepWuKt+Vi/9
-wkMgiGxZcyksZeQetRcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
-ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFPdYFv2AH/oQwWqKy2ihzahAgR2V
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN5dGtpjalyqnvqRHWxL4Tn9eVTKSFWX+AvJZm
-qlpsut89DA7N+/UhLA1BbZ9wg3KDEm9RGAht4wgD93/IZYlx1j+0nPrxqVNx0m/W
-eU0ZWryznc0lcjNBDV8DeDade4mwE7+TyhIZUgda5zKgt9Y42158d0shEImaKv8m
-AXS8rGoFju52nMGLqFOS3FvfIkJuAjbliNwjGDttWcaLCXnYzHm9xz68ZuCN6jck
-RlnCVqAGtP0QepeXLlTMfzWV0XA6YIrBjRRiyQfvwftVgTz7Tm3ppBMLYMkspKc3
-s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testd.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANp8PNQfoLNyMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MDhaFw0yMDA5MTQxNDUyMDhaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9
-bNdjjH8LoeCSVdvTQhF9I2ova5M2td2yrGvlaz2AzK59rCcOJwaJMysp0IieO8vV
-l3I1MQjlahh5OWXNqZO5+o6OQzfF/0K3kwrA067Shm+99a8Arz/UdEuT6ykNzizP
-7DGyp5Pe2lNlHCWa3HJQJoDbFU+x7cAuV2WkUl04DTyP8LRaLD1+NRoiRtsEUDm5
-ag3f5u3hJV1zYF3v/dlRldDUTfkQMEjhdg1QLxYDeDFojiI2NHjvSomw1uTeKE14
-Ktfgmc3O4slBpPTwJuxtUrw3STTqnV5R2h2JtzTMsidtRlMVugglKepWuKt+Vi/9
-wkMgiGxZcyksZeQetRcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
-ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFPdYFv2AH/oQwWqKy2ihzahAgR2V
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN5dGtpjalyqnvqRHWxL4Tn9eVTKSFWX+AvJZm
-qlpsut89DA7N+/UhLA1BbZ9wg3KDEm9RGAht4wgD93/IZYlx1j+0nPrxqVNx0m/W
-eU0ZWryznc0lcjNBDV8DeDade4mwE7+TyhIZUgda5zKgt9Y42158d0shEImaKv8m
-AXS8rGoFju52nMGLqFOS3FvfIkJuAjbliNwjGDttWcaLCXnYzHm9xz68ZuCN6jck
-RlnCVqAGtP0QepeXLlTMfzWV0XA6YIrBjRRiyQfvwftVgTz7Tm3ppBMLYMkspKc3
-s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml b/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 94540810..00000000
--- a/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testc.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
-y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
-OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
-QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
-n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
-3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
-5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
-MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
-UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
-53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
-iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
-KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
-Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
-y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
-OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
-QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
-n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
-3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
-5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
-MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
-UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
-53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
-iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
-KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
-Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml b/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 6d5429ef..00000000
--- a/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testd.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
-eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
-bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
-FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
-WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
-goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
-QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
-MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
-lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
-v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
-To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
-DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
-dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
-MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
-eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
-bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
-FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
-WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
-goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
-QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
-dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
-MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
-lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
-v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
-To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
-DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
-dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml b/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4ed32872..00000000
--- a/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ab11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
-NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
-vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
-jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
-ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
-JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
-INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
-KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
-qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
-cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
-bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
-lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
-oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
-NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
-vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
-jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
-ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
-JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
-INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
-KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
-qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
-cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
-bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
-lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
-oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ab11.ladok.umu.se-dw-idp.xml b/swamid-2.0/ab11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 44809ae2..00000000
--- a/swamid-2.0/ab11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NVoXDTIwMDkxNDE0NDY1NVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA20MzxVPNZ9neMtajUc2359oCVX4D+wEUbiXgIMsxY8DAXtCmd+l67m2kx+YCX/46NRLDNPHLCU7Bu58Ewj9GHQIDAQABo30wezAdBgNVHQ4EFgQUtxi4m0aVS9GdTNkQ6w0G7PGRfkswTAYDVR0jBEUwQ4AUtxi4m0aVS9GdTNkQ6w0G7PGRfkuhIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkAkTI2ewflfkkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ10ix83WSSw6jxI+DYgcRpdEdULrNiEPbRPn9ZlrciZUpRNbexqaAYTrgFWBkQbXhAnw6Ro9fVgNcAitkzhYEw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/ab11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/ab11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index d02ad98d..00000000
--- a/swamid-2.0/ab11.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ab11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKMtDIJtZFr9MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYzNloXDTIwMDkxNDE0
-NDYzNlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDCpyOMaQFXaHnFeEtdQFuqVqRxQU2lsU1RJFfS
-x+oYlXJjffMbkd1IzpQAEVQ+aoCAePd/mKDRuojRGesFqZfXjc3F4i1dnqBSSjLA
-mpIbwZ2Dl5rqaaaOFQC2rhHzpT2O4UXmEkqxC4OBlN+2RN/JB/Ldqs1gASY74uEb
-km8Y4xQIEmGIoCPnbtaghjf38NJl0aiIz6xHY0VCbqii3haNjp9PBlFpYZWtjr0h
-Ngr0cW/9ZTpISo8YtAvzHKu7DD5uRQvI67OSod9Tfj9Hf10bfBY6Ngo4rHXgibaJ
-Z9R28iKynEV14vjJlv7HSNq8JcmNnZF7VSe/axUxjvEkQtb7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUygQJMXOd+edUUzmGi9ITq22yFIswDQYJ
-KoZIhvcNAQEFBQADggEBAG8AVb5K537W8X9FaYuGnjF6CMfYq2vU6v9jE0tFqo4J
-qz81KXEeXV+IErIcJBqL0TfleHfG1sHz1cxpHimMOakH0N8qXYbDrTWwbptAVP1A
-Se9vokcbJpPxp5oWDz2tAMJT9X8ICC3/m2X4k2lIkUXTOk3fKsNwSpOHesGBeuXl
-ig7ynWlWk2zh9xxGDSM24YZUFXGRImn/hFAKqwEHjGMwx18K02o3I8ZLKKsPyQVm
-bOR+PNmBCmMKuVF2QQEN38+F0VtU/ekZ7gnVY2Uf/3pNPVVMASg50otkYp0yyULE
-BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ab11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKMtDIJtZFr9MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYzNloXDTIwMDkxNDE0
-NDYzNlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDCpyOMaQFXaHnFeEtdQFuqVqRxQU2lsU1RJFfS
-x+oYlXJjffMbkd1IzpQAEVQ+aoCAePd/mKDRuojRGesFqZfXjc3F4i1dnqBSSjLA
-mpIbwZ2Dl5rqaaaOFQC2rhHzpT2O4UXmEkqxC4OBlN+2RN/JB/Ldqs1gASY74uEb
-km8Y4xQIEmGIoCPnbtaghjf38NJl0aiIz6xHY0VCbqii3haNjp9PBlFpYZWtjr0h
-Ngr0cW/9ZTpISo8YtAvzHKu7DD5uRQvI67OSod9Tfj9Hf10bfBY6Ngo4rHXgibaJ
-Z9R28iKynEV14vjJlv7HSNq8JcmNnZF7VSe/axUxjvEkQtb7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUygQJMXOd+edUUzmGi9ITq22yFIswDQYJ
-KoZIhvcNAQEFBQADggEBAG8AVb5K537W8X9FaYuGnjF6CMfYq2vU6v9jE0tFqo4J
-qz81KXEeXV+IErIcJBqL0TfleHfG1sHz1cxpHimMOakH0N8qXYbDrTWwbptAVP1A
-Se9vokcbJpPxp5oWDz2tAMJT9X8ICC3/m2X4k2lIkUXTOk3fKsNwSpOHesGBeuXl
-ig7ynWlWk2zh9xxGDSM24YZUFXGRImn/hFAKqwEHjGMwx18K02o3I8ZLKKsPyQVm
-bOR+PNmBCmMKuVF2QQEN38+F0VtU/ekZ7gnVY2Uf/3pNPVVMASg50otkYp0yyULE
-BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 6e92fe4c..00000000
--- a/swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1NloXDTIwMDkxNDE0NDY1NlowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxKoZ2R4wqHTsoHWKrBmG7ZDUJDQbho7KIuEk0X0M7xU+NCKoKonp4k30dPDE04A/wpa79H8Py3irHk3RDTi4PwIDAQABo30wezAdBgNVHQ4EFgQUj9vp3rHOfveG/lzqBwtTNB6bdDgwTAYDVR0jBEUwQ4AUj9vp3rHOfveG/lzqBwtTNB6bdDihIKQeMBwxGjAYBgNVBAMTEWFiMTEubGFkb2sudW11LnNlggkApR6V0pKid5kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADyOPKxSFokymgo6mCWCKb3S8J5c9GHaMTehLjksxAEQVhrsTRb4Yo1txR5JWKEnJVY7D6/ApgcBZT/LQWX/Cvc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/at11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/at11.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index c1ba137e..00000000
--- a/swamid-2.0/at11.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJANDF4JozA8JNMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTMzMFoXDTIxMTIxMzE0
-MTMzMFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDnKm2nhCzGWhJzOzCnHGt5XHzzIh8+cj4Rr8bS
-Gy0e+6mrcKW22K26bYDJaS/N/896KiKZvPlNndsuReLQrdI8U6QIJQwN3Ywh8VRD
-GJzyLoLoBHbx1TxyWOvTv67gNU/KxFhohfqyh3sZmLzNPllywrKDw92+ZM+iurlb
-2/KGtdMkb9TrLLNbVKbqfUpDgC4NYaRS8R9JRTH/T5ljHDOhDZdka4toT1EsxLoZ
-4ZBC2W5asNfYl1z0OMVGcIF6HHIWzrx6xC45lVno0GNH5syG87TO3shvRdHCTHxK
-3CBYghDsKGQRb3BPiGAscWS4TOflFOaUmjVaaDuD0jEM62kVAgMBAAGjZDBiMEEG
-A1UdEQQ6MDiCEWF0MTEubGFkb2sudW11LnNlhiNodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUF7/sek8lHr5/n/+20PFjxKGC//0w
-DQYJKoZIhvcNAQEFBQADggEBAGvwBNDdiNbSmzmKyDTGCFA7z/6yfu9XR0sC3K5b
-6MmCwiaK6J05B575HVKe2clrcLrKDIPFG+9KxXj8rEyyhqi9RtjNxWTH/thSBO4q
-pf1P0K+PTwv621tHQ5ImGDKb6KZBGby3X+65VxUevvhZfmxBq2asOBOGcwfwQ9kJ
-DxKxLZoX41ZyX2xeWXNx0zCyT5uJPckqFwwrhpLEm12NWCdaP+v3Ij9TI8Oyv5AY
-uU3VreB64f1jHCu5pVXj76xsngziC8kHMWeZlGMsJJtmY1zNaGMFuut9Aa+EF1Y8
-4KIL+YCngtznR9qXQy9LxZFzyfUAasIIwqEMj3hJApZk6EQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/at11.ladok.umu.se-aws-sp.xml b/swamid-2.0/at11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index c25d80fd..00000000
--- a/swamid-2.0/at11.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP1hE0EHIKsuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1N1oXDTIwMDkxNDE0
-NDY1N1owHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDGeqaN0xm5tGKhfustShB5dhNalA0Jx/f9VFq3
-3FNiJYPEAAJVf0OF3wZiBUrxOBEMV5PGXrYKGf+xSTc+H0wDTuRawKFODjsz/bZc
-5ndDebnLIX9PUVjF/WF3Yw6kDbZ5JbbPLiF3O5iW8t2AKs0Ndc49kSVz/zRXVCpM
-3EbpwPdo053CkeUCliBvjrBcXSnSdYjCWBFbpMYOPVI8e7+V7uNYrNOji753YIEV
-L0g3jdqCiji0rcyPM2E3/hdf7gBxrlfKCpPQLFLtb9/3oFfdLBrTS2VW8qb/Ci1e
-hEwtGrW51UEDLlpWIrztP04f3jTV2Vm8xVaHKvC5B6aeyVHhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUuiQ/KAggEI27yW++bwnaS+O6BI4wDQYJ
-KoZIhvcNAQEFBQADggEBADSRol2Nrm5TLvSIz+/CuYylk7iQgBMDrZJarIRnJjpk
-woAtaxOiUB5xjWmxdPx+ZHd3dkhDAiHoi6+lJ1rPlXbl4McZcYj5eX6RlnDbReNf
-HFj15o9YnXX77u8wTDbWwiQdi6nXPvXdOm06WqdftI9zGTGfMJt9ii8NYMiXcKMo
-IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
-6u+JDhKqz0EKIXx6UWEzCld9JHIEbx0zf1E9XlRHn3VPdW6wDLc1vSD/6/cyle0k
-/neyaEfxBBMMp9/pi9PY+4ELupANMkXNDG/bbqOSW2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP1hE0EHIKsuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1N1oXDTIwMDkxNDE0
-NDY1N1owHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDGeqaN0xm5tGKhfustShB5dhNalA0Jx/f9VFq3
-3FNiJYPEAAJVf0OF3wZiBUrxOBEMV5PGXrYKGf+xSTc+H0wDTuRawKFODjsz/bZc
-5ndDebnLIX9PUVjF/WF3Yw6kDbZ5JbbPLiF3O5iW8t2AKs0Ndc49kSVz/zRXVCpM
-3EbpwPdo053CkeUCliBvjrBcXSnSdYjCWBFbpMYOPVI8e7+V7uNYrNOji753YIEV
-L0g3jdqCiji0rcyPM2E3/hdf7gBxrlfKCpPQLFLtb9/3oFfdLBrTS2VW8qb/Ci1e
-hEwtGrW51UEDLlpWIrztP04f3jTV2Vm8xVaHKvC5B6aeyVHhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUuiQ/KAggEI27yW++bwnaS+O6BI4wDQYJ
-KoZIhvcNAQEFBQADggEBADSRol2Nrm5TLvSIz+/CuYylk7iQgBMDrZJarIRnJjpk
-woAtaxOiUB5xjWmxdPx+ZHd3dkhDAiHoi6+lJ1rPlXbl4McZcYj5eX6RlnDbReNf
-HFj15o9YnXX77u8wTDbWwiQdi6nXPvXdOm06WqdftI9zGTGfMJt9ii8NYMiXcKMo
-IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
-6u+JDhKqz0EKIXx6UWEzCld9JHIEbx0zf1E9XlRHn3VPdW6wDLc1vSD/6/cyle0k
-/neyaEfxBBMMp9/pi9PY+4ELupANMkXNDG/bbqOSW2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/at11.ladok.umu.se-dw-idp.xml b/swamid-2.0/at11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index d8ab977f..00000000
--- a/swamid-2.0/at11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA60//AcTkRl0pPS/OS4NBCtkYARgJSClYBVIJB3id7sJQWCHEg0WOgG5xssqzenzo5vB3aGE9RWAPOMzFeW4nQwIDAQABo30wezAdBgNVHQ4EFgQUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVIwTAYDVR0jBEUwQ4AUxGJ9TmX0Ysp2VlxH5qhdQ6tUsVKhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA3boreaB4aEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALKT2kc8xEaA2voTRnAaM7iy3eDR9UNZLtfRFLbXce1ybdr1+XMwxrus7deW+Eai49kJ6weuv8a9LoxuilzTe0w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/at11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/at11.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 259c96c3..00000000
--- a/swamid-2.0/at11.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAPduxdjJbDBGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmF0ikJUxhbUg2KfwoygOHjDRaGuRs2wqlumyiO8aIJHIDKUpLZdJsKyyPZa1QMgEf1a9tRGIXvNEiaSyls6ACwIDAQABo30wezAdBgNVHQ4EFgQUvoJSh0zbgnkPcoYySWKrjdeMHUwwTAYDVR0jBEUwQ4AUvoJSh0zbgnkPcoYySWKrjdeMHUyhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA927F2MlsMEYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJQ2pDCbf/jVgAO+gMhtDELqeAZo4Rk6Zn+U7YIXvoY6S8oq7hdP8p8T9MFUoiVcIIiT5/vfcDr61o17ffWKxtI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBrjCCAVigAwIBAgIJAPduxdjJbDBGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmF0ikJUxhbUg2KfwoygOHjDRaGuRs2wqlumyiO8aIJHIDKUpLZdJsKyyPZa1QMgEf1a9tRGIXvNEiaSyls6ACwIDAQABo30wezAdBgNVHQ4EFgQUvoJSh0zbgnkPcoYySWKrjdeMHUwwTAYDVR0jBEUwQ4AUvoJSh0zbgnkPcoYySWKrjdeMHUyhIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkA927F2MlsMEYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJQ2pDCbf/jVgAO+gMhtDELqeAZo4Rk6Zn+U7YIXvoY6S8oq7hdP8p8T9MFUoiVcIIiT5/vfcDr61o17ffWKxtI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8452/idp/profile/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/at11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/at11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index ca3f4a43..00000000
--- a/swamid-2.0/at11.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJ39O0nkjAShMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0
-NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCh76LCe/1lh8corKOoSU1ooBLymfKGnksQR0sn
-q61NQl539XmT6RqyE6Bv/lKaWBxo73DUAvSSZk6du7wmM0Rrhq9xUPphd8fm2aHy
-psf/CId4UL/ahQy0koCWKw5IbP1vKyeMKHwcj9pWc+mVnhkWkYb9PtL4KTYC0Hez
-dUKiyQJiFB0QBMO3ED4hq0tE0McC9dx0FM6zJ8A67jjxpevapIukKBIP26/ZtyP5
-kWfeA+ziQpATZEK7rK4ykufqrdxN7VqtBhRb5rOlHJoecLj+pi02PuIuGb2PW1O/
-PqQ1SyO5ZT2ymtVkZBreGAedpk+CKBfF7PSgP00Dj4vebUc5AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUr1nAwUxvgfmegsSTv80sXtYFs5gwDQYJ
-KoZIhvcNAQEFBQADggEBAAgIhwoUpSH6WxMqnAC9JQM4+/NexKMpeWu7gSfppf1t
-cLX6REa6oFn2GNXYvZGX7UMx3yJDqgSUa046GyulZeB0jr2E4ecEPc0MePQJVW6P
-FQ2KNnmWuL0zdljWC9RAwdZt853x3ey6Jy6lV9gmsbu4JfMKkn29/NxWylQjqOg3
-tdV9fuHjjGgWBEoKMZFnWnRCKBj0+84EUfZ/Mko5h4f1JCtYJQ1/xis+QnJd+S3l
-NtXfJmZRkbaYmrLN9uPyYww61OfYNbQ1D20uil8fFqOPops9ueg07uWo4Cfv5MDK
-DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://at11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJ39O0nkjAShMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OFoXDTIwMDkxNDE0
-NDY1OFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCh76LCe/1lh8corKOoSU1ooBLymfKGnksQR0sn
-q61NQl539XmT6RqyE6Bv/lKaWBxo73DUAvSSZk6du7wmM0Rrhq9xUPphd8fm2aHy
-psf/CId4UL/ahQy0koCWKw5IbP1vKyeMKHwcj9pWc+mVnhkWkYb9PtL4KTYC0Hez
-dUKiyQJiFB0QBMO3ED4hq0tE0McC9dx0FM6zJ8A67jjxpevapIukKBIP26/ZtyP5
-kWfeA+ziQpATZEK7rK4ykufqrdxN7VqtBhRb5rOlHJoecLj+pi02PuIuGb2PW1O/
-PqQ1SyO5ZT2ymtVkZBreGAedpk+CKBfF7PSgP00Dj4vebUc5AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWF0MTEubGFkb2sudW11LnNlhiBodHRwczovL2F0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUr1nAwUxvgfmegsSTv80sXtYFs5gwDQYJ
-KoZIhvcNAQEFBQADggEBAAgIhwoUpSH6WxMqnAC9JQM4+/NexKMpeWu7gSfppf1t
-cLX6REa6oFn2GNXYvZGX7UMx3yJDqgSUa046GyulZeB0jr2E4ecEPc0MePQJVW6P
-FQ2KNnmWuL0zdljWC9RAwdZt853x3ey6Jy6lV9gmsbu4JfMKkn29/NxWylQjqOg3
-tdV9fuHjjGgWBEoKMZFnWnRCKBj0+84EUfZ/Mko5h4f1JCtYJQ1/xis+QnJd+S3l
-NtXfJmZRkbaYmrLN9uPyYww61OfYNbQ1D20uil8fFqOPops9ueg07uWo4Cfv5MDK
-DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 88e5d569..00000000
--- a/swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDY1OVoXDTIwMDkxNDE0NDY1OVowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAvfiuH+XAH8B+AXF7Hqgya/3bDsi7xRDeM+wdt5i+EuDSxQ0maeAxzYVhJYE8dIWAeg+4uWbwzOTlNx4/77DQswIDAQABo30wezAdBgNVHQ4EFgQU3p+IpGOSd+XxAUPXW/Qg8VbR9CYwTAYDVR0jBEUwQ4AU3p+IpGOSd+XxAUPXW/Qg8VbR9CahIKQeMBwxGjAYBgNVBAMTEWF0MTEubGFkb2sudW11LnNlggkAmT3bCvcTy+MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALrPYcrjgIEPY9C3bkzpehALFCv1Wj46oTRNFzAK8iWCRBkc9CApKED7xAuSUCMfS26z78OdUgcE9L827WROkuM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml b/swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 1974a16a..00000000
--- a/swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testc.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMTNaFw0yMDA5MTQxNDUyMTNaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RjLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQD2SkGI8BHuMXZOkDycqBu4YGMkjI3ZkAZeJzpt1QTJ+6pUlCw2xPROoJebgYMj38rnbAtfFtuQ0o9+FzFFZcWdAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD+L+xjNDr29WszNUuWQZTkjAqLXMFMGA1UdIwRMMEqAFD+L+xjNDr29WszNUuWQZTkjAqLXoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDgon/Tt3l7CjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAQz+uxbXQKPUahTYFSdWd2IffSHiGo1arzLUNiLDV9mRhhEHlyP/A82wEaABZXOr+QOizmTnvn888Q/G7kFuOwA==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml b/swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index b7898210..00000000
--- a/swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testd.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUyMDlaFw0yMDA5MTQxNDUyMDlaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RkLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCaCTQr44+bqB7qYAzacQ62nojCUkiCC8DFixL66WVvl/l3xVzmXzdEWLL94yM55hDhI2rSHJutc8wXo+DWdn0nAgMBAAGjgYUwgYIwHQYDVR0OBBYEFFZ8IMdds7UFN9C666H+q5KDdBEhMFMGA1UdIwRMMEqAFFZ8IMdds7UFN9C666H+q5KDdBEhoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQC0T44Gtdwc/jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAhFpyEHGBhJC3Zc1D5BpKNVKqIe3lEXyZhKarRNPo0J44lw+6BevT+qyYPfRvaa3aFzfrc2GmOuLWN7apS9v1og==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml b/swamid-2.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index b65392e9..00000000
--- a/swamid-2.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.testc.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIByDCCAXKgAwIBAgIJAONOoNkuanjeMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTE0MzM5WhcNMjIxMDA4MTE0MzM5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOGuybYMfqEJl3PTvX2uQuHlFpASqIUpakptQjA9Omz1cmi/YTuS4dFPkr5aIl8H6JXtGFdo+Lq3gH65GnUdd28CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUGnxfGjrwc3UH63OtKWL56joyuPQwVAYDVR0jBE0wS4AUGnxfGjrwc3UH63OtKWL56joyuPShKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDjTqDZLmp43jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAIS7QmF/7Dydbfb7ob7eiX7ASIZSSkN8M8Hoei6VIokrs0+FPgzL8rcJTr5LiCec2hBDvlTBt5wvQ3gmh9Oywww==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIByDCCAXKgAwIBAgIJAONOoNkuanjeMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTE0MzM5WhcNMjIxMDA4MTE0MzM5WjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOGuybYMfqEJl3PTvX2uQuHlFpASqIUpakptQjA9Omz1cmi/YTuS4dFPkr5aIl8H6JXtGFdo+Lq3gH65GnUdd28CAwEAAaOBhjCBgzAdBgNVHQ4EFgQUGnxfGjrwc3UH63OtKWL56joyuPQwVAYDVR0jBE0wS4AUGnxfGjrwc3UH63OtKWL56joyuPShKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0Yy5sYWRvay51bXUuc2WCCQDjTqDZLmp43jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAIS7QmF/7Dydbfb7ob7eiX7ASIZSSkN8M8Hoei6VIokrs0+FPgzL8rcJTr5LiCec2hBDvlTBt5wvQ3gmh9Oywww==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml b/swamid-2.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 8dd9a984..00000000
--- a/swamid-2.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.testd.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIByDCCAXKgAwIBAgIJAPV86YQgG+jXMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTEzODMyWhcNMjIxMDA4MTEzODMyWjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrrJQ3t1LwfBueH8pcBbBocDtD2AX8zKG9hor4MAylvE9NW4GDSpsEJNUFSjK+TQlsvmplt2WpTce97Ifs1UVECAwEAAaOBhjCBgzAdBgNVHQ4EFgQUPr+iaIhVcj5eHKQM+EO4yV6VtmAwVAYDVR0jBE0wS4AUPr+iaIhVcj5eHKQM+EO4yV6VtmChKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQD1fOmEIBvo1zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAqt4T+C2Ff2gysd2ZcgpBaiTtsMpmiFiD9Bak2uQp+PmWGYvQNNGsOaZMqNCW4rUPCwa9Ny4OcF0jPqzi+sFd5w==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIByDCCAXKgAwIBAgIJAPV86YQgG+jXMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTEzODMyWhcNMjIxMDA4MTEzODMyWjAkMSIwIAYDVQQDExllY3NpZHAudGVzdGQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrrJQ3t1LwfBueH8pcBbBocDtD2AX8zKG9hor4MAylvE9NW4GDSpsEJNUFSjK+TQlsvmplt2WpTce97Ifs1UVECAwEAAaOBhjCBgzAdBgNVHQ4EFgQUPr+iaIhVcj5eHKQM+EO4yV6VtmAwVAYDVR0jBE0wS4AUPr+iaIhVcj5eHKQM+EO4yV6VtmChKKQmMCQxIjAgBgNVBAMTGWVjc2lkcC50ZXN0ZC5sYWRvay51bXUuc2WCCQD1fOmEIBvo1zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAqt4T+C2Ff2gysd2ZcgpBaiTtsMpmiFiD9Bak2uQp+PmWGYvQNNGsOaZMqNCW4rUPCwa9Ny4OcF0jPqzi+sFd5w==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/expert.testc.ladok.umu.se-ecs-sp.xml b/swamid-2.0/expert.testc.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 8cd3e03d..00000000
--- a/swamid-2.0/expert.testc.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testc.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>expert.testc.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://expert.testc.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=expert.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAKJWAsJDLMImMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGWV4cGVydC50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTExMjE5MDgyMjE3WhcN
-MjExMjE2MDgyMjE3WjAkMSIwIAYDVQQDExlleHBlcnQudGVzdGMubGFkb2sudW11
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2pz6o63Xzb+P9Yj
-cdpWpmMDgoo7s1WOpAnWuI5XKHdH6ga5KskOAh3O5Ge7IhOA5UXLWkjeCmHwz12V
-MgH6+lRhidGuWBVUN/wKAEbxW/QfEmPkD4Caho/yPO7QKWPF8qamLSg/3nzQ3cx0
-I6CEo91VEx+IvU01u1PXCCSw2+2pDMjC+2PmhHaIlodTqmB/oGb++SiFy4qFH7D+
-Y5Qye0Y3nq3kpUcz3DViUFlQ4VsSkgeAecH/JHcADn54IoJjc0pRbaqk2JOrhsdJ
-uUarb9aOPTYXDVncsM2mpdnmM9G+FGeTKtW0QjSugdKCOxCmRq/uf7+cqV/6hYWy
-xvV2DwIDAQABo3EwbzBOBgNVHREERzBFghlleHBlcnQudGVzdGMubGFkb2sudW11
-LnNlhihodHRwczovL2V4cGVydC50ZXN0Yy5sYWRvay51bXUuc2UvZWNzLXNwMB0G
-A1UdDgQWBBQJH+Mkvr7/Qe6Odm0qsWFvQLaVHzANBgkqhkiG9w0BAQUFAAOCAQEA
-Y8Tz9sFCvNKdrL5RXY2wP262a5o6E3HnTgmwwQvqERgHsa4VWJB7PimyNw/DoMj9
-JDdPmA+T4hvN63yvF20gDeXgsp1d3tFL3Tz95H3DFOhbBiG1jGsG9452l6R/xwDh
-qgtwHUbIEit/5RbmKPIGAHJpLqQ2kGQiF1x1mh9IQyge1SF++E+uByx3PuRmGMCY
-/RTmK3mRS93Ca5V3ndU1IVOTkJ7L+ufyvWs81yfKHGLFpDGBY/AzkICR8CNn/xDY
-Xt/gYbR+Pxbv1VyV2mw1pRcHI4umTchoZ9n/xYk9Vpjxa0/nEOeaa6Klh8kmeT/w
-w8W5oFPayICDCTdBw3YHuA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.testd.ladok.umu.se-ecs-sp.xml b/swamid-2.0/expert.testd.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 46991f08..00000000
--- a/swamid-2.0/expert.testd.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testd.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>expert.testd.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://expert.testd.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=expert.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANj1qXDuP0qVMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGWV4cGVydC50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTExMjE5MDgyMjEzWhcN
-MjExMjE2MDgyMjEzWjAkMSIwIAYDVQQDExlleHBlcnQudGVzdGQubGFkb2sudW11
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2x3IEjpR3Xm0qnqe
-oOxF7uhB9qhGS42Xj2GuvnZuCByAwdzY01QGomY9oFEAfOEktRHfrHHkpAi1vHUD
-U4LBuMaLgwHJhvRmgRmoP06OljeKAthUMfD5njp11FeLdP/q8LLg6X+xEGrLZ9YX
-b1UNpwNSpt8h8uA1tnqyW2sXkEKc02j9RiGA4E4J94KyLx27pcH2QEayajr6Lkpb
-CuwTQm+XwI/uQEFG/+0CIS/CLL3UwSMGRmFLZ/jJavWAHSwaYJlNCKyil9jrG/YG
-fC7dxvF+Asp2RIzsU4rJiCezd+C4DK6Q3x6GyOBPQVGy8btgWhO9bzcveqospP6Y
-k9p7PwIDAQABo3EwbzBOBgNVHREERzBFghlleHBlcnQudGVzdGQubGFkb2sudW11
-LnNlhihodHRwczovL2V4cGVydC50ZXN0ZC5sYWRvay51bXUuc2UvZWNzLXNwMB0G
-A1UdDgQWBBR/D73bYAl5778wms3R9bepBe4EGDANBgkqhkiG9w0BAQUFAAOCAQEA
-M81O6A1nImVnHsuwaZNLxfobZLBpVQ6ZXnpWtea51l2IZhSWzndXxElKFDWoVhRr
-WJ5r9+4k13Bk/BqOGIP3tkiR/imQ0a+QvqGKQwlhLk4DW1h5WYqK9U0e+tbf1LZG
-NCsuRUN6Sv6oz6aPRN1/RhHXQz+1wJ/aPFt9QW04ON2LOjkEBUcUchshgTW26T3p
-r0mVU4gQwDefa9S3tFrcJM1H5R2T6o/tKP9iU4Hk+/UwVZ5Nhp4xzCGI+uxsOuWh
-1tiYDQdgl9rM4M7RU7i8eRXeqiJjy8M5GqaNf52qZqDO8Q24vwXbnuDqtntS1Y1s
-D9i+gxjig0iyrkrILGeOdQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ft11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/ft11.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 8b87312e..00000000
--- a/swamid-2.0/ft11.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJANtbtklz05rBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTMzNFoXDTIxMTIxMzE0
-MTMzNFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDfLU/sYujYYgHAiUmNh1vlaHRa2RMcgQ/IR5Um
-7yniNVVyVXvHxqLREuST5IAaMbh12az7g9hdSm6JhDfaoHXwahL/BGp18vtNktpv
-JQL9cJheOxKq6YcDlRCl9tPSDZBxNB+v3y7g3ULyAv76xWBxlEBDmXI0QnZA8kCv
-EXZqKL8wROnZn0a97Vms9+kdnkYxnVeh8QW8q6thHcz621kuXNh9pGmhecj2RPlb
-jKb8L/a7DNeRFJDs6yZjfiQSS7fQ1vTg2L9YENdA7QKsgOd/Lrz4TaNi7EJ6tr22
-aAvvzKpgOSwlF8R0FQkMVMujWt8Z6zARQUwm6Q2R8+Pdkh+xAgMBAAGjZDBiMEEG
-A1UdEQQ6MDiCEWZ0MTEubGFkb2sudW11LnNlhiNodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUtUb0gPLYY0CkSmck208LHi9xHp0w
-DQYJKoZIhvcNAQEFBQADggEBAMqyWMw/U+gNDjQ43Az8xqMc5OButif55s1gnu/N
-BiZMi1Q24HcTB3U3rZX0J8tHxUx+mafrYBe7PCO+XDhPhD73sNI53CG4UhAdD9hW
-ZeYhpSUYi9veyecETO2ELMhsnw/hyGf8jHTkSPfXn/KW1rSYCKMR8yEgPj2b3IAU
-tTmrX0AN8z9lR0m/A7bQRG0diz/xSi/GSuJylX2ub3cAGamGZUfUezXW/0UFfcJX
-oGWknQPhM+a4qV+wqpZJsuu/1vlRtoarHoMzKfCXj3dlnjnYEsJ6b1448FsglEBG
-cAPbVt5WXPJfyQ9aIwH6FMg6rzmos2O4n7Us9gatMw6tTGI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ft11.ladok.umu.se-aws-sp.xml b/swamid-2.0/ft11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 1957324e..00000000
--- a/swamid-2.0/ft11.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAONLDIY7xJ0qMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMFoXDTIwMDkxNDE0
-NDcwMFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDmNJ9a41uG70456BPJrqd0hl1MCKZVtSVcQDAx
-5BXucaYNWapH5F9NpNHwWDsIMB8k7ST6Vea1VElbvEYhUxWE1EeLzS4s4bpfpM/9
-ZSuj9ihQCC3ggKJ2KW4021MzgdlgAaPNtPOLFD1WlRwObHANYUqXUSdw0gb2uBHe
-GUQSSGUp14Rh/k8STpb34+pSjaa9uKn0lxzYolNDeoc5YT4oSfF4mSiclHVvhJR3
-O809q2G27CmjkEgR5Xa+23+eH8J0K0bWRtqxiteC+RChY7aF0uXm+WwCnZOnI/Hm
-hdIeJ2Q5z2o7M3jTo0/GVFKmYG5IhKz9My0FBSVlXGh+3fjzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUEN7TqCRS1WbFkVsqxlZWe+5PIzwwDQYJ
-KoZIhvcNAQEFBQADggEBACmZOL3YyS+zfzd9QXBg6jnT9MeW4IxCkM3Rho+m89G5
-o5jgNMmCDIAcIxSjVrN1wEycni1vYla8WhI5t8vMUKtcBd2qciZ7nnWZP5ykeZ7J
-gMIBK9OomzMoQcsooUcztn9bAs27X5BG7CnVdX9zApb9gy2KdpQ0jTGc8x2iikHA
-+eQmxk04sVIe2TKF4ep0x4w4YqvabCb2uJ7t0onxrM/tWQW69J/fkJa6qJLIbD/4
-mjZ5pGVZ3BTafKJGgjN3PJTAffATr8gPDWktLCjOrFCSuHN3JE7/01U1f6fMih1c
-Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAONLDIY7xJ0qMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMFoXDTIwMDkxNDE0
-NDcwMFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDmNJ9a41uG70456BPJrqd0hl1MCKZVtSVcQDAx
-5BXucaYNWapH5F9NpNHwWDsIMB8k7ST6Vea1VElbvEYhUxWE1EeLzS4s4bpfpM/9
-ZSuj9ihQCC3ggKJ2KW4021MzgdlgAaPNtPOLFD1WlRwObHANYUqXUSdw0gb2uBHe
-GUQSSGUp14Rh/k8STpb34+pSjaa9uKn0lxzYolNDeoc5YT4oSfF4mSiclHVvhJR3
-O809q2G27CmjkEgR5Xa+23+eH8J0K0bWRtqxiteC+RChY7aF0uXm+WwCnZOnI/Hm
-hdIeJ2Q5z2o7M3jTo0/GVFKmYG5IhKz9My0FBSVlXGh+3fjzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUEN7TqCRS1WbFkVsqxlZWe+5PIzwwDQYJ
-KoZIhvcNAQEFBQADggEBACmZOL3YyS+zfzd9QXBg6jnT9MeW4IxCkM3Rho+m89G5
-o5jgNMmCDIAcIxSjVrN1wEycni1vYla8WhI5t8vMUKtcBd2qciZ7nnWZP5ykeZ7J
-gMIBK9OomzMoQcsooUcztn9bAs27X5BG7CnVdX9zApb9gy2KdpQ0jTGc8x2iikHA
-+eQmxk04sVIe2TKF4ep0x4w4YqvabCb2uJ7t0onxrM/tWQW69J/fkJa6qJLIbD/4
-mjZ5pGVZ3BTafKJGgjN3PJTAffATr8gPDWktLCjOrFCSuHN3JE7/01U1f6fMih1c
-Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ft11.ladok.umu.se-dw-idp.xml b/swamid-2.0/ft11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index e6fb91ca..00000000
--- a/swamid-2.0/ft11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoN/OfcumvxPQX/EaGe7OTfGBk9bnJPD+SKjS5HetmrYwMeUHLh8wBPckoYqCEisr41skNNseiqlmzNAM9Tkp9wIDAQABo30wezAdBgNVHQ4EFgQUXHMrHva6DV+mAejgfgPKqrmjIhMwTAYDVR0jBEUwQ4AUXHMrHva6DV+mAejgfgPKqrmjIhOhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkAp2h41EoB2wwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI50sWq1v1J6Tw0iDSXQ2xYRD8mA2mxD20KMtnhfOy18tUSlaWxN6YXFwH5x4MQcfaemaxnV1VrkpJG0DcE4Zrs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/ft11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/ft11.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index d8f952d3..00000000
--- a/swamid-2.0/ft11.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJANBiS9OLRJ9IMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1GOs+V9RmWvQaoj9EhK+VbXaEPHkislgaf99/wK5woiuYvTvz+X9CcLUQpgdn726mJHjnENuXMFKFNGV0i1q1wIDAQABo30wezAdBgNVHQ4EFgQU07qj2zK3kz7JeshJzgpyb+1tGEkwTAYDVR0jBEUwQ4AU07qj2zK3kz7JeshJzgpyb+1tGEmhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA0GJL04tEn0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGcir8I3KTVd2LL4ZBu/hGhazxsVXLO4K8pGgOz2mce5WlaR/1rJLbwzV2VncIGbr2Yil0u8tPAgt45HnNJYiEM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBrjCCAVigAwIBAgIJANBiS9OLRJ9IMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1GOs+V9RmWvQaoj9EhK+VbXaEPHkislgaf99/wK5woiuYvTvz+X9CcLUQpgdn726mJHjnENuXMFKFNGV0i1q1wIDAQABo30wezAdBgNVHQ4EFgQU07qj2zK3kz7JeshJzgpyb+1tGEkwTAYDVR0jBEUwQ4AU07qj2zK3kz7JeshJzgpyb+1tGEmhIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA0GJL04tEn0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGcir8I3KTVd2LL4ZBu/hGhazxsVXLO4K8pGgOz2mce5WlaR/1rJLbwzV2VncIGbr2Yil0u8tPAgt45HnNJYiEM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8452/idp/profile/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/ft11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/ft11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index cf15b9ea..00000000
--- a/swamid-2.0/ft11.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKO4rcJ3zABpMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0
-NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDDK/UXWctJFiMJovcV9vGcoZsbUP35d5aoH3X
-aovqxcVdzl+vtjv7XUPTQP1VjjqB/OiOTJ1MfHPKBsw3ZlTCP2TLQH/RaHMvRs6v
-NikuyKeTAv+9lqpulFwvSW4wn+Z1B5FWiCEejdv26nc5a+0m2hyHkIdouB2oe/pR
-PuhIjOYZ9aDqQTGR8d2hNorKL2vWGRWRsHIIzMvHJR5SQpR/S8w9bJWnP1Cx+7hC
-cMO2SO6h3NEck0akBW8wYIEMulwXUqnE+cIWVWXxVS9UmZQw6w5pRsHB6MKnxY67
-AZKCeBilb1rRbx9h1opBM36TVBJooEuNiUPhxRatpJwTu8MFAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU0XVhglgUeNc60HCGRTnmqUWKiWowDQYJ
-KoZIhvcNAQEFBQADggEBAGTcvssSNqdDxIkR0H1XEecAJuas0zwWNI76wP/PqdG1
-SxhCd/0WiD+aT229a5N7lU8YW1BD3T7ePjTtdGMihEeHRfsxSR+LStY5PUdjys3A
-o0XtlztaGp6wPMSYXcKklEZ7GS6MINcYp0i8+mmsEw/PJGpWkjrNjPscFHN0P7wp
-aLw6EVQYXbySpQ/VWUmI/RjpRIzW0o2oeTnts4W/nV76GHCEoaFA6PbG+Tiy9MHc
-ouNps+VFNT0ORVfslF33KLGLh2ucUrP/OPZzqJbq7roMTYMfgxek8ZwYEXj/iA8O
-pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
-        <ds:KeyName>https://ft11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKO4rcJ3zABpMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMVoXDTIwMDkxNDE0
-NDcwMVowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDDK/UXWctJFiMJovcV9vGcoZsbUP35d5aoH3X
-aovqxcVdzl+vtjv7XUPTQP1VjjqB/OiOTJ1MfHPKBsw3ZlTCP2TLQH/RaHMvRs6v
-NikuyKeTAv+9lqpulFwvSW4wn+Z1B5FWiCEejdv26nc5a+0m2hyHkIdouB2oe/pR
-PuhIjOYZ9aDqQTGR8d2hNorKL2vWGRWRsHIIzMvHJR5SQpR/S8w9bJWnP1Cx+7hC
-cMO2SO6h3NEck0akBW8wYIEMulwXUqnE+cIWVWXxVS9UmZQw6w5pRsHB6MKnxY67
-AZKCeBilb1rRbx9h1opBM36TVBJooEuNiUPhxRatpJwTu8MFAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWZ0MTEubGFkb2sudW11LnNlhiBodHRwczovL2Z0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU0XVhglgUeNc60HCGRTnmqUWKiWowDQYJ
-KoZIhvcNAQEFBQADggEBAGTcvssSNqdDxIkR0H1XEecAJuas0zwWNI76wP/PqdG1
-SxhCd/0WiD+aT229a5N7lU8YW1BD3T7ePjTtdGMihEeHRfsxSR+LStY5PUdjys3A
-o0XtlztaGp6wPMSYXcKklEZ7GS6MINcYp0i8+mmsEw/PJGpWkjrNjPscFHN0P7wp
-aLw6EVQYXbySpQ/VWUmI/RjpRIzW0o2oeTnts4W/nV76GHCEoaFA6PbG+Tiy9MHc
-ouNps+VFNT0ORVfslF33KLGLh2ucUrP/OPZzqJbq7roMTYMfgxek8ZwYEXj/iA8O
-pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index f62b0ea2..00000000
--- a/swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwMloXDTIwMDkxNDE0NDcwMlowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAmTD8POwxWMLC9rP5jvSPGtJrnG06CnVn7kHSNK++WGF6b8zcTHLSN1ZwDbG1O4RutGsm3S3fxu93y+FDAUz+UwIDAQABo30wezAdBgNVHQ4EFgQUqFhQOOb7ezwhgOn0epU1C9iGkE4wTAYDVR0jBEUwQ4AUqFhQOOb7ezwhgOn0epU1C9iGkE6hIKQeMBwxGjAYBgNVBAMTEWZ0MTEubGFkb2sudW11LnNlggkA5nE2l4H9gaowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADjnkBbTvtbAYkS/lAEZ1AQwG4B744M4Xo5pvs303977eg9MGNz4dBuHkW/V8EIVb3CwpKpcL7w+X3sgkA1Ij9E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/hubbletest.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 115309ea..00000000
--- a/swamid-2.0/hubbletest.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://hubbletest.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIJANqWy4ROsxP8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MzkwOFoXDTIx
-MTIxMzE0MzkwOFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtzAbNpVTDhNJn6xAzatXS
-pLnJNXU/OEUsRzFvtJxHo2t/vhfJLJWsbSz4iNvCjvuaGhN1nC6qt90gd4goLGG8
-qT69iznSypgCLHptCkMUW8DzYLx9+Mi24pXSMI7pq2x9S1GZ6TMeviZZjDeTpu8e
-2uR6yz2ufU4utTdFgINmKQQGgJtrOHngDsG0DvyDy5kqGcESxIytguFV9grDB63V
-ROQ/6CJ4upGXHFVT9qB3nAHKL5hW6xvKytSmIC6ukcV7CwOHaAGN7CmhiLhYLr6Z
-E5x29NIkSIuZ6RksNBIbXpbeaVaXnRBr/I9IZhlHsQM6WASgx8wR0OXmmqQPqduz
-AgMBAAGjcDBuME0GA1UdEQRGMESCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhilo
-dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4E
-FgQUPAZXAor+fQd6f+IGyA2YTJTAvzIwDQYJKoZIhvcNAQEFBQADggEBAIWscK9c
-gJW1B1+7fIb4BrqtK2GvbIBoSTqKrtIO+kgS0anyVOgWUzS7RSfLmYW9+MbpidiE
-K+K6Z/Za9QE5EjMgQxa6wutIOb+lNb8N0awncrVfJNX1eQl2XaJmC+l/+R4+UX4p
-0KZPIzx6WJcNIM8+ltM5ZXUbYp/rdigx9d8veK9rQG+9XpRpe3Ju/GFmGkKX13gR
-Pj4e3G1nGTVTYm145M1eS+pk8hcMV4LHiXKRncmwY0XgcSNHfwXO5UPYw1rbK0Fh
-ubZdMaAlXrTvU4rmu2zmpe8y04DNyTFhvltRsvpFaizhN0N2L6mSywdMl2GJ99gB
-qIxQGEdChCCBgvI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index e5ad3a10..00000000
--- a/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://hubbletest.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAM5xCO8etNExMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MVoXDTIw
-MTIwNTEwMjQ1MVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZBNax9hbTmSFMa1tyqf2x
-pO+LvZvp8cmd/pthY7wx1hEq/zQ4aCESQhatTg0vHe1V7TTpLx18VSp2JpvjFUq2
-PH5JfPV4qukzMtrTfmOtXLacp785o1Qo/Vy1uUEs0397a9hIfgGkT82jYkU0nNe2
-E4z90m/vVLnn5gWlQgAJ8g1hiwahZfEpnxGG1+5+ffge7Uf1O6LblI7covNpVUid
-012lhQcqCocv32b4biCnJEEJ082o7qz0dKzFtDUQ7m3wld65NgAJi9MhQHEMPF6O
-dxGTTRLg/VxhUdIKos20OPa1zsFbMXu45Jgn9xAgp/9j/SCHvQ9I3mM4sGd0asBL
-AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
-dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU
-CbwIjkYHopEO5fqkOYeeZLCjCF4wDQYJKoZIhvcNAQEFBQADggEBADvxJ5lUZXFq
-46MOfG2w/XiRwnEJWZe5bqUum3XsdsSN7qEAhE0joe5BvFgran9JQygZnOiNworx
-o2XU0Wqm76BEvKS0la5SZRlLA2QMndR3IA45BZfBm3Qpqi8HH7Udc2JfZGNrMuin
-aBPrGMjEKKfqPVXWCMkpvM+8I3eUnqzt5rw6XIaWDzlHPCdPmKHlHH3cboZ41lDA
-o004uPuSEWzw8iAJONm77G1BLQctlKYyvvJaDtPq9UoLi5uLI1JQIWfHoDhtBfGe
-ijYpfmjFyi/A92GHFRNjE4QVGRR8kecHx0uC6ueWEXBXyxndSxTR9EPpCI9e6YNY
-DWzZe2mHU5s=
-</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://hubbletest.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAM5xCO8etNExMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MVoXDTIw
-MTIwNTEwMjQ1MVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZBNax9hbTmSFMa1tyqf2x
-pO+LvZvp8cmd/pthY7wx1hEq/zQ4aCESQhatTg0vHe1V7TTpLx18VSp2JpvjFUq2
-PH5JfPV4qukzMtrTfmOtXLacp785o1Qo/Vy1uUEs0397a9hIfgGkT82jYkU0nNe2
-E4z90m/vVLnn5gWlQgAJ8g1hiwahZfEpnxGG1+5+ffge7Uf1O6LblI7covNpVUid
-012lhQcqCocv32b4biCnJEEJ082o7qz0dKzFtDUQ7m3wld65NgAJi9MhQHEMPF6O
-dxGTTRLg/VxhUdIKos20OPa1zsFbMXu45Jgn9xAgp/9j/SCHvQ9I3mM4sGd0asBL
-AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
-dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU
-CbwIjkYHopEO5fqkOYeeZLCjCF4wDQYJKoZIhvcNAQEFBQADggEBADvxJ5lUZXFq
-46MOfG2w/XiRwnEJWZe5bqUum3XsdsSN7qEAhE0joe5BvFgran9JQygZnOiNworx
-o2XU0Wqm76BEvKS0la5SZRlLA2QMndR3IA45BZfBm3Qpqi8HH7Udc2JfZGNrMuin
-aBPrGMjEKKfqPVXWCMkpvM+8I3eUnqzt5rw6XIaWDzlHPCdPmKHlHH3cboZ41lDA
-o004uPuSEWzw8iAJONm77G1BLQctlKYyvvJaDtPq9UoLi5uLI1JQIWfHoDhtBfGe
-ijYpfmjFyi/A92GHFRNjE4QVGRR8kecHx0uC6ueWEXBXyxndSxTR9EPpCI9e6YNY
-DWzZe2mHU5s=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml b/swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 029e7d3f..00000000
--- a/swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJANLq4OZpe55MMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1M1oXDTIwMTIwNTEwMjQ1M1owIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA2Fn4jYxMvzBoAI/9XjTirxcmU/YSGvJV668ZuW9SRZQRMhdXTj/Ct0MPIRsTK256/TkUit9ISqOUaHbq7ycwPwIDAQABo4GEMIGBMB0GA1UdDgQWBBRfPik1sc4sm0VdmVgbK65T7BZpnDBSBgNVHSMESzBJgBRfPik1sc4sm0VdmVgbK65T7BZpnKEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDS6uDmaXueTDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAc+oA/4hTzwUGQbsJ+z0iHYyiVuXiiT3z7wyCqAN8pfpa2yayrW1/XOLiG4EuDxpNF/C4f01kZwyCCsz1Nqgplw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hubbletest.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJANLq4OZpe55MMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1M1oXDTIwMTIwNTEwMjQ1M1owIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA2Fn4jYxMvzBoAI/9XjTirxcmU/YSGvJV668ZuW9SRZQRMhdXTj/Ct0MPIRsTK256/TkUit9ISqOUaHbq7ycwPwIDAQABo4GEMIGBMB0GA1UdDgQWBBRfPik1sc4sm0VdmVgbK65T7BZpnDBSBgNVHSMESzBJgBRfPik1sc4sm0VdmVgbK65T7BZpnKEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDS6uDmaXueTDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAc+oA/4hTzwUGQbsJ+z0iHYyiVuXiiT3z7wyCqAN8pfpa2yayrW1/XOLiG4EuDxpNF/C4f01kZwyCCsz1Nqgplw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/hubbletest.ladok.umu.se-ecs-idp.xml b/swamid-2.0/hubbletest.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index a68f30e9..00000000
--- a/swamid-2.0/hubbletest.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJAJysAH562fj7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAs3FGeb/F3/8sjtttoBQp3OcF2iFgcvOtI5cmVyBTx5b/5gKxEG9FO0xXO7QMhQ2zMFC4Xm1PNFrRMBo40w6zJQIDAQABo4GEMIGBMB0GA1UdDgQWBBRUvrXXPSrGYRgxbVxRfFR4MuP58DBSBgNVHSMESzBJgBRUvrXXPSrGYRgxbVxRfFR4MuP58KEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQCcrAB+etn4+zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAICH6MIvsZewQDhYz6U57cTdl06wlKAiBQdwZRJ7P4OCAZVjI66xSb47xd2qJcq+bxVxl+J6CY8d4PH2F9WunsQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hubbletest.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBwjCCAWygAwIBAgIJAJysAH562fj7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAs3FGeb/F3/8sjtttoBQp3OcF2iFgcvOtI5cmVyBTx5b/5gKxEG9FO0xXO7QMhQ2zMFC4Xm1PNFrRMBo40w6zJQIDAQABo4GEMIGBMB0GA1UdDgQWBBRUvrXXPSrGYRgxbVxRfFR4MuP58DBSBgNVHSMESzBJgBRUvrXXPSrGYRgxbVxRfFR4MuP58KEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQCcrAB+etn4+zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAICH6MIvsZewQDhYz6U57cTdl06wlKAiBQdwZRJ7P4OCAZVjI66xSb47xd2qJcq+bxVxl+J6CY8d4PH2F9WunsQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8452/idp/profile/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/hubbletest.ladok.umu.se-ecs-sp.xml b/swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index d7efa8e4..00000000
--- a/swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://hubbletest.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAMHgh8Q6vsedMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MloXDTIw
-MTIwNTEwMjQ1MlowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRAHC7OUXdXewrMUWcRqoa
-6I3/znBTt+XPSCzf7aLnfRz35iP2jj4WPE/GWWLbfwHqdbTJ7Rtp0KrNXtFVCPXv
-XsBONnx3rIl/KU9iGIv6ICAdH83yqXF50B5mvwHgO7KXhXokiF+K6uM+2RqXMs+q
-9w9knyHQs1/NWXzLaEENG27HuR3pYDkiVDnQA6FT6WfoO7fvzUxPiLgI47+qeESA
-ieLh9Q26pixYycsGSKHTo2TK0SvYtxB2FVWNYDFHb9WYwuIFlQRurehrckvxNr58
-Pp5CVTLcZhGO9IbQoFTQj7L6gY6H1Ped0VcD+JK6oGtS5t+VZ8fk7h/EgxxVopJf
-AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
-dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU
-0K8/aTv9MuDohuDTagFI/JNU8iUwDQYJKoZIhvcNAQEFBQADggEBAIv5wk8aUMbm
-yFBpaI7iweOPhr0wGoVR3Vvp1/uhb0FRz4p6snp1Ps2TgGjGNlNTc22lpHRVjaMc
-c9uOkUqhomDa5YhO9S2zFPv/pRNFZ0Xgf0lVFk7u2jqP/sKuUGUbypCwRv+R7ZNG
-jFWT7wq2RS3L3pZCOW5OceJHSpxSFPVWJ6UPhUwPESl/Q75HU3mvWAUE7DjcbjK6
-F+Rzb5tk6M1wcYe+P9G7Y60+qe4a38GeOZwHQgKVH7Uo+d5YekxuXJLKrwN0mKSL
-GawGIqkPtA/Y3LAJhwA9qpVH6jywJy53/exXtdno7dwRUjKd8hR+/RqWTSdO6nzf
-6OZggcYa9mo=
-</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://hubbletest.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAMHgh8Q6vsedMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MloXDTIw
-MTIwNTEwMjQ1MlowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRAHC7OUXdXewrMUWcRqoa
-6I3/znBTt+XPSCzf7aLnfRz35iP2jj4WPE/GWWLbfwHqdbTJ7Rtp0KrNXtFVCPXv
-XsBONnx3rIl/KU9iGIv6ICAdH83yqXF50B5mvwHgO7KXhXokiF+K6uM+2RqXMs+q
-9w9knyHQs1/NWXzLaEENG27HuR3pYDkiVDnQA6FT6WfoO7fvzUxPiLgI47+qeESA
-ieLh9Q26pixYycsGSKHTo2TK0SvYtxB2FVWNYDFHb9WYwuIFlQRurehrckvxNr58
-Pp5CVTLcZhGO9IbQoFTQj7L6gY6H1Ped0VcD+JK6oGtS5t+VZ8fk7h/EgxxVopJf
-AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
-dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQU
-0K8/aTv9MuDohuDTagFI/JNU8iUwDQYJKoZIhvcNAQEFBQADggEBAIv5wk8aUMbm
-yFBpaI7iweOPhr0wGoVR3Vvp1/uhb0FRz4p6snp1Ps2TgGjGNlNTc22lpHRVjaMc
-c9uOkUqhomDa5YhO9S2zFPv/pRNFZ0Xgf0lVFk7u2jqP/sKuUGUbypCwRv+R7ZNG
-jFWT7wq2RS3L3pZCOW5OceJHSpxSFPVWJ6UPhUwPESl/Q75HU3mvWAUE7DjcbjK6
-F+Rzb5tk6M1wcYe+P9G7Y60+qe4a38GeOZwHQgKVH7Uo+d5YekxuXJLKrwN0mKSL
-GawGIqkPtA/Y3LAJhwA9qpVH6jywJy53/exXtdno7dwRUjKd8hR+/RqWTSdO6nzf
-6OZggcYa9mo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 1d6fcb1e..00000000
--- a/swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1NFoXDTIwMTIwNTEwMjQ1NFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1mFR94qRsjGB+ukhqu+R/2fvZb9aQ39OrsNhQM8q22dtv8vK9X/ZX+Ym1Mv7/AVMCDwZhEVM2ioPFijk+hQAQQIDAQABo4GEMIGBMB0GA1UdDgQWBBTsJeuxItIS63xBOl92WQmpIgNm5jBSBgNVHSMESzBJgBTsJeuxItIS63xBOl92WQmpIgNm5qEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDjDsLXLLwXUTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EABXkSZKvoDu+elTr2M3Gcj0Igx0D2zaE2l7SW59JJLprHL0TGL4WQfVCXZbJD3ffwzOLQ7A3yoF6ddFohFgt0Ig==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hubbletest.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1NFoXDTIwMTIwNTEwMjQ1NFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1mFR94qRsjGB+ukhqu+R/2fvZb9aQ39OrsNhQM8q22dtv8vK9X/ZX+Ym1Mv7/AVMCDwZhEVM2ioPFijk+hQAQQIDAQABo4GEMIGBMB0GA1UdDgQWBBTsJeuxItIS63xBOl92WQmpIgNm5jBSBgNVHSMESzBJgBTsJeuxItIS63xBOl92WQmpIgNm5qEmpCQwIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2WCCQDjDsLXLLwXUTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EABXkSZKvoDu+elTr2M3Gcj0Igx0D2zaE2l7SW59JJLprHL0TGL4WQfVCXZbJD3ffwzOLQ7A3yoF6ddFohFgt0Ig==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/it11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/it11.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 26cda097..00000000
--- a/swamid-2.0/it11.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://it11.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJAMFV0Pgb7IB6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTMzN1oXDTIxMTIxMzE0
-MTMzN1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC8Yp9ShPoGyk/90NP9M5rCF3ndDDtAz93AvZhv
-Dh6hQc6+ijKxXaa04dzG8cbeLmWvWYKO932XtRpgh/Gu7Nnzo6DcKdOjeB0eio+P
-VYsPCy6yVn4YR1TDzK8Azo1Nc7lxm9xit+/KWWshVF1Cp9xklsxBD9PnlJ2oH54r
-f/yRC3d81l5CNLkCQyAk5UThzgdwDwnwAmr6/0keoUe3V3oiQ1e7I5sT/JNBYN4e
-32v5+S3m0+Rkvono9zTLB02hiFYRXkZmaWBmESGq1AaIoaowIxoD8DyqSCYI+T+e
-b1wkx4LN76e4Tjd03fNL0ffZIgFV65OJcgGGPaoYIqkeL5hFAgMBAAGjZDBiMEEG
-A1UdEQQ6MDiCEWl0MTEubGFkb2sudW11LnNlhiNodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUqqvnl/vVaKb9aDi9kTgjQsSKrxsw
-DQYJKoZIhvcNAQEFBQADggEBAHGUHqM6b7jFoHUGlOeDxP1inH8fVJTwEI2/0Ite
-7S73a3n/o7FucRH1dyhc/LF2QDicTdCC6kL+D/WSabXDOMMKYhlO2pOrIpJK5cxk
-c6xp48ZdPJP5H354go7Ns7DOjDdFHEAKseCDmDkpbVrwPWdiaiBGaUpQ7gEPRYOu
-MQ+4jyAZFD97hMDaN83D8/JNOHMwuMMl0kkab520b4m0Xgoe8DeuIW07rX/3mJBQ
-a8TzyNruiLmHHg+q81vk7tcfYU0jiHu53BASFkkDzvwseHLdh6MV+HcuJUC+DSii
-+6WPpPEemGs0njRt/Xc6qakCCWOKV880BONKtK+fVtPsE2Y=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/it11.ladok.umu.se-aws-sp.xml b/swamid-2.0/it11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index f1d546a0..00000000
--- a/swamid-2.0/it11.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://it11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKuqYxyQ4zHlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDKaQVOX/zOAtEAMfDlYyG5vGJHLbJpHfCeBE8w
-saEF9ElgUi6f8gEmMgD2ZRiDR9XxALzIt3GorDkcYIuKJ4gq2/gSoSvPpSZuA5CQ
-LfcLS2kax9Fw9BJyiwhQ7xX5vU8UfoVyjmYhhzs9OefVJJgrjNuuc+hygtSmtH4c
-56BgHPXcecRDTQ0plEW4qB+x/irzBZE0bDCbxufv5W5NV49phnwU5NvSeR1c7Aem
-0KF9nWC4JQMTOrj3YnL/0esxLre5LwDfFIVZmVwC6em7owFeSozLAYiUzQyp1J+l
-kZITLjPAvmOtN4FST7rNP3I1NdyzHmBnKzl0oyNyCUxciHx7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU+g4MKy6dJJ+8jkqt45EByzKyBBcwDQYJ
-KoZIhvcNAQEFBQADggEBAHq/mDMIQhX0NKoS4/Sv4M+XPDDD2aaFaZx+ygOwg4a5
-j+L1tEby4V+ROAez2Pvea4TeyG/xMofhvpzlS5Pp2FJnnvuZxiO4Ty18dB5w8IlH
-aXy0rQ0Y9tCPgvi3ipvvnO74lyxNujHf3U+U0TW0PuxoiQMY1fzxZsttRPH3HXkB
-wu1/Pzvuqt8i4GQgpFop7Te6joIfmapXVs8Oi2NK2dMHo5rKOPbk9+UGfbFpmgpU
-sYGdWKEt9Bj7n9rPO12xPufnxqK2+DRr4DC7/yXsUu2oLLOiNaxwXIsyQmZlP0IC
-FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://it11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKuqYxyQ4zHlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDKaQVOX/zOAtEAMfDlYyG5vGJHLbJpHfCeBE8w
-saEF9ElgUi6f8gEmMgD2ZRiDR9XxALzIt3GorDkcYIuKJ4gq2/gSoSvPpSZuA5CQ
-LfcLS2kax9Fw9BJyiwhQ7xX5vU8UfoVyjmYhhzs9OefVJJgrjNuuc+hygtSmtH4c
-56BgHPXcecRDTQ0plEW4qB+x/irzBZE0bDCbxufv5W5NV49phnwU5NvSeR1c7Aem
-0KF9nWC4JQMTOrj3YnL/0esxLre5LwDfFIVZmVwC6em7owFeSozLAYiUzQyp1J+l
-kZITLjPAvmOtN4FST7rNP3I1NdyzHmBnKzl0oyNyCUxciHx7AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU+g4MKy6dJJ+8jkqt45EByzKyBBcwDQYJ
-KoZIhvcNAQEFBQADggEBAHq/mDMIQhX0NKoS4/Sv4M+XPDDD2aaFaZx+ygOwg4a5
-j+L1tEby4V+ROAez2Pvea4TeyG/xMofhvpzlS5Pp2FJnnvuZxiO4Ty18dB5w8IlH
-aXy0rQ0Y9tCPgvi3ipvvnO74lyxNujHf3U+U0TW0PuxoiQMY1fzxZsttRPH3HXkB
-wu1/Pzvuqt8i4GQgpFop7Te6joIfmapXVs8Oi2NK2dMHo5rKOPbk9+UGfbFpmgpU
-sYGdWKEt9Bj7n9rPO12xPufnxqK2+DRr4DC7/yXsUu2oLLOiNaxwXIsyQmZlP0IC
-FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/it11.ladok.umu.se-dw-idp.xml b/swamid-2.0/it11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 94d942f8..00000000
--- a/swamid-2.0/it11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNFoXDTIwMDkxNDE0NDcwNFowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAoetgXgm7pvPvMAP28Cg2mMdkmkt6XB9uMkNS5JTul+Oty3B2H6WerU87oF5DiemVJoYyfqKxBhAu4PwDmG22swIDAQABo30wezAdBgNVHQ4EFgQU3frAe6FsIYkRko2nf4JWJsfRy0YwTAYDVR0jBEUwQ4AU3frAe6FsIYkRko2nf4JWJsfRy0ahIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAs/e1Q9xP8k8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJYbiQWyEfUTbSPRJBeJB0Aigzr3zQimJK+/kbMj2f4ZtY6lqv/ZVKQxxkMRZUqRq7Qerne6O2dh5KtyYxTTcT8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/it11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/it11.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 1881bb00..00000000
--- a/swamid-2.0/it11.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJANvKImxOFvyVMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAviV3q8RgER4oeYk7i9B6tgvoI+GJuqNfGHYMANEFv3/+tylDE2JkoodqpgAAEBnrd6HybpNq2kWiXLZhb+QVXQIDAQABo30wezAdBgNVHQ4EFgQUcAgBRmQ1ot38QuGh/mpPR8QRWZ8wTAYDVR0jBEUwQ4AUcAgBRmQ1ot38QuGh/mpPR8QRWZ+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkA28oibE4W/JUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH2e2VAkeKqk+zeEmKxpIAHm6KapHTEXRgRXP/BHTaytofyqugKrJWft/MjpSuINkUy4AUXgf9xgf1QoWg2CfM8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBrjCCAVigAwIBAgIJANvKImxOFvyVMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAviV3q8RgER4oeYk7i9B6tgvoI+GJuqNfGHYMANEFv3/+tylDE2JkoodqpgAAEBnrd6HybpNq2kWiXLZhb+QVXQIDAQABo30wezAdBgNVHQ4EFgQUcAgBRmQ1ot38QuGh/mpPR8QRWZ8wTAYDVR0jBEUwQ4AUcAgBRmQ1ot38QuGh/mpPR8QRWZ+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkA28oibE4W/JUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH2e2VAkeKqk+zeEmKxpIAHm6KapHTEXRgRXP/BHTaytofyqugKrJWft/MjpSuINkUy4AUXgf9xgf1QoWg2CfM8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8452/idp/profile/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/it11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/it11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 68922e62..00000000
--- a/swamid-2.0/it11.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://it11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJANVNcct/lAgHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDeC/ZeytAUYweQ+TiZnOzAhOQzsXvIpTBROk1z
-QYEejwD15UCDnK2TgnPSBMIFsWLzMs4svoVC13Dszrxkeaundc9WD1gdbkZ1F218
-UiLYAW4EQLL0CZ9xbzymSLJChYpwPW5pz4Q0jP1iwlZsmg8X4dwaJ37tD8X7ZT46
-hBpe6LzDvwGJrJYpAtQXSPH1KN+X5swIZIyDSLwSwK7sXyPoyjRaTjE/NJq8PTm0
-pqARgGZ2YAHz59lvnCvCx2u97MgrHG0jDLl4Q+E+N4dDYdmFvHAijgTAZsS8C/S/
-WfKcKszGiV5t51ou1w0TSwbibUJ+2kwo8Jfa0mv7MNhBGRmPAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUT+tR392AFCLM9g0r73l7MF/mvr0wDQYJ
-KoZIhvcNAQEFBQADggEBACh5/529PBBzqJE3IA1XJibr+FnUkHYm7tEUs6WSH1PK
-qcsV7OFm/yGp+RiJPNXjFF3W1fj0G4MzTCHlFxT1+EZtuEM+b20IiQDzI2iEnCdc
-xn3vOx10+4TYU81a3iD+YJOH0SYuyWX3EpyHRptwUk1eZrUJYHuWphvVZHJNfI80
-IWaX1D8a3eyQIczTz3XiDFezGoHBJLUV77oc/fphAjQjGkQubsoMchtg4mO9Vaww
-DorX9Z7NMhBecPZnP8IWkyWsqdHJ7CupHj9JH/H9tZzFWxdZ1hlPzAMldalfbQOm
-covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://it11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJANVNcct/lAgHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwM1oXDTIwMDkxNDE0
-NDcwM1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDeC/ZeytAUYweQ+TiZnOzAhOQzsXvIpTBROk1z
-QYEejwD15UCDnK2TgnPSBMIFsWLzMs4svoVC13Dszrxkeaundc9WD1gdbkZ1F218
-UiLYAW4EQLL0CZ9xbzymSLJChYpwPW5pz4Q0jP1iwlZsmg8X4dwaJ37tD8X7ZT46
-hBpe6LzDvwGJrJYpAtQXSPH1KN+X5swIZIyDSLwSwK7sXyPoyjRaTjE/NJq8PTm0
-pqARgGZ2YAHz59lvnCvCx2u97MgrHG0jDLl4Q+E+N4dDYdmFvHAijgTAZsS8C/S/
-WfKcKszGiV5t51ou1w0TSwbibUJ+2kwo8Jfa0mv7MNhBGRmPAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWl0MTEubGFkb2sudW11LnNlhiBodHRwczovL2l0MTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUT+tR392AFCLM9g0r73l7MF/mvr0wDQYJ
-KoZIhvcNAQEFBQADggEBACh5/529PBBzqJE3IA1XJibr+FnUkHYm7tEUs6WSH1PK
-qcsV7OFm/yGp+RiJPNXjFF3W1fj0G4MzTCHlFxT1+EZtuEM+b20IiQDzI2iEnCdc
-xn3vOx10+4TYU81a3iD+YJOH0SYuyWX3EpyHRptwUk1eZrUJYHuWphvVZHJNfI80
-IWaX1D8a3eyQIczTz3XiDFezGoHBJLUV77oc/fphAjQjGkQubsoMchtg4mO9Vaww
-DorX9Z7NMhBecPZnP8IWkyWsqdHJ7CupHj9JH/H9tZzFWxdZ1hlPzAMldalfbQOm
-covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 82c11641..00000000
--- a/swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcwNVoXDTIwMDkxNDE0NDcwNVowHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwkRupA18tlKKmCTVVMmw39aEgRcoc+J9jSCnK05WSt+tVIjIpTtxyoba8k7LrJL8GO42W/efl5l3pTde6Qot6QIDAQABo30wezAdBgNVHQ4EFgQUY0+1e5RBqKtiVtIxjqdQQFQg3c8wTAYDVR0jBEUwQ4AUY0+1e5RBqKtiVtIxjqdQQFQg3c+hIKQeMBwxGjAYBgNVBAMTEWl0MTEubGFkb2sudW11LnNlggkAuxsdoDYEopYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH+6yw25nt0jsfmMNJ2Sf0S4MxrV0eklCo+cJ2B8JEPkY73Vh44B9l9NC6gNnNCTiSvailXHD8SZlX8Qc2bpinM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 94fb3d7f..00000000
--- a/swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-00.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAPWmpqFS/L0HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwMzM3WhcNMjIwNjI0MTMwMzM3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKRR5KotOWLu7l6muQ79UgiWCVnDlhlDHvP35Pr6+l+qYNYOs/7Tj3AxqVZ5VbHBcAs3Jy24FLaehvXgEJEXCUMCAwEAAaNQME4wHQYDVR0OBBYEFFpKhfUOvkIupy7lxNKwx/Z9zyAmMB8GA1UdIwQYMBaAFFpKhfUOvkIupy7lxNKwx/Z9zyAmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIAnEcvv6+3f+bKtnTqFKwKFXtt23jyFkFyYC7wMnNiFFhzgu/AhVhT5lcokjyrIl/klOWfWQ9xjBWHCWuhiRg
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAPWmpqFS/L0HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwMzM3WhcNMjIwNjI0MTMwMzM3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKRR5KotOWLu7l6muQ79UgiWCVnDlhlDHvP35Pr6+l+qYNYOs/7Tj3AxqVZ5VbHBcAs3Jy24FLaehvXgEJEXCUMCAwEAAaNQME4wHQYDVR0OBBYEFFpKhfUOvkIupy7lxNKwx/Z9zyAmMB8GA1UdIwQYMBaAFFpKhfUOvkIupy7lxNKwx/Z9zyAmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIAnEcvv6+3f+bKtnTqFKwKFXtt23jyFkFyYC7wMnNiFFhzgu/AhVhT5lcokjyrIl/klOWfWQ9xjBWHCWuhiRg
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/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/ladok3-01.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-user-idp.xml
deleted file mode 100644
index f22f9be3..00000000
--- a/swamid-2.0/ladok3-01.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-01.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAMCbtfYJ5dzmMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTEzODEwWhcNMjIwNjI3MTEzODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANPI+aER/JhQjlhBqISUes5kVWGa/hSWGdzXmIn817nylLopgXSXTBw6YRuP4P0wM+xFB16yAfPMtXPgNiPwdjMCAwEAAaNQME4wHQYDVR0OBBYEFGvBTsJT1+qJRruTgfjVEOW3QLL8MB8GA1UdIwQYMBaAFGvBTsJT1+qJRruTgfjVEOW3QLL8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQA4KSyXYAg53OX66SCMR15MdMzIOwZezi3/Ofx6A0fxomSigTr1lI8txl3WrgCgjZl1M9XXjt2MsTKvtUp1ua+Z
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAMCbtfYJ5dzmMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTEzODEwWhcNMjIwNjI3MTEzODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANPI+aER/JhQjlhBqISUes5kVWGa/hSWGdzXmIn817nylLopgXSXTBw6YRuP4P0wM+xFB16yAfPMtXPgNiPwdjMCAwEAAaNQME4wHQYDVR0OBBYEFGvBTsJT1+qJRruTgfjVEOW3QLL8MB8GA1UdIwQYMBaAFGvBTsJT1+qJRruTgfjVEOW3QLL8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQA4KSyXYAg53OX66SCMR15MdMzIOwZezi3/Ofx6A0fxomSigTr1lI8txl3WrgCgjZl1M9XXjt2MsTKvtUp1ua+Z
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:8445/idp/profile/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/ladok3-02.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-user-idp.xml
deleted file mode 100644
index ef96321f..00000000
--- a/swamid-2.0/ladok3-02.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-02.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAJRGZvEIQDmEMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA2WhcNMjIwNjI3MTIwODA2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5ZNsDNc3TF2GoQi/WwkMz059rKCZOVbUmSQGcmvCn11x5zx825ffuQ6j+de7i2Vv4uvfIAfWwrEYR1GHtg1usCAwEAAaNQME4wHQYDVR0OBBYEFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMB8GA1UdIwQYMBaAFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCjNnOVcciOtqeqZeNhXaIzKbYPapti/pZLQ52dU6dVxIzKOA0w1XZCHZJ/sxCkGxk9ocIo3u5N77BhU25ByLks
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-02.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAJRGZvEIQDmEMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA2WhcNMjIwNjI3MTIwODA2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5ZNsDNc3TF2GoQi/WwkMz059rKCZOVbUmSQGcmvCn11x5zx825ffuQ6j+de7i2Vv4uvfIAfWwrEYR1GHtg1usCAwEAAaNQME4wHQYDVR0OBBYEFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMB8GA1UdIwQYMBaAFFX4gQ5+Gp/x+kOe0E90tkg/7EoIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCjNnOVcciOtqeqZeNhXaIzKbYPapti/pZLQ52dU6dVxIzKOA0w1XZCHZJ/sxCkGxk9ocIo3u5N77BhU25ByLks
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se:8445/idp/profile/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/ladok3-03.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 62ea17e2..00000000
--- a/swamid-2.0/ladok3-03.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-03.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJALb4QvoyypFOMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA4WhcNMjIwNjI3MTIwODA4WjAhMR8wHQYDVQQDDBZsYWRvazMtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHxkmrGQNtgj0R5i17tm7OmmpKXk6Q2DZKTWcAQN3zZKbjqw0w9z7bNrtEJSPEmLKCfuIAFvoYTkik1LJ+VoQsCAwEAAaNQME4wHQYDVR0OBBYEFHGGau5hX0do3t9pCv2HMEESPS3iMB8GA1UdIwQYMBaAFHGGau5hX0do3t9pCv2HMEESPS3iMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDCPzJ64aeJ0eOoRW71p++Ij9qYw5KhDV7ITwTNzs0IhMIkMQvt9sJ83d22rYbH5eAJHVHERIVDpefLEpa0ktyd
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-03.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJALb4QvoyypFOMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA4WhcNMjIwNjI3MTIwODA4WjAhMR8wHQYDVQQDDBZsYWRvazMtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHxkmrGQNtgj0R5i17tm7OmmpKXk6Q2DZKTWcAQN3zZKbjqw0w9z7bNrtEJSPEmLKCfuIAFvoYTkik1LJ+VoQsCAwEAAaNQME4wHQYDVR0OBBYEFHGGau5hX0do3t9pCv2HMEESPS3iMB8GA1UdIwQYMBaAFHGGau5hX0do3t9pCv2HMEESPS3iMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDCPzJ64aeJ0eOoRW71p++Ij9qYw5KhDV7ITwTNzs0IhMIkMQvt9sJ83d22rYbH5eAJHVHERIVDpefLEpa0ktyd
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se:8445/idp/profile/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/ladok3-04.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 5585d686..00000000
--- a/swamid-2.0/ladok3-04.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-04.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJANPLS0K54P4ZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA5WhcNMjIwNjI3MTIwODA5WjAhMR8wHQYDVQQDDBZsYWRvazMtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANOhkVrIMMyWE8pChmHiDLxFaaThCHTUoXktWxcmjgDqJi+IFgmpF3YvY464fC01Cce2LkPFRmcPzlNGu45jsrkCAwEAAaNQME4wHQYDVR0OBBYEFJUxbkgsfPkTFfSGA5D/VVdRRC6IMB8GA1UdIwQYMBaAFJUxbkgsfPkTFfSGA5D/VVdRRC6IMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIV9Cl+cn1VGu93W/RTzlSJBpqZ5FeFOzGdmirFuZwph4NTJXOR+4Jwwptm92IaCyoxIfLbSjtT4gAdN4IKdCs
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJANPLS0K54P4ZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA5WhcNMjIwNjI3MTIwODA5WjAhMR8wHQYDVQQDDBZsYWRvazMtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANOhkVrIMMyWE8pChmHiDLxFaaThCHTUoXktWxcmjgDqJi+IFgmpF3YvY464fC01Cce2LkPFRmcPzlNGu45jsrkCAwEAAaNQME4wHQYDVR0OBBYEFJUxbkgsfPkTFfSGA5D/VVdRRC6IMB8GA1UdIwQYMBaAFJUxbkgsfPkTFfSGA5D/VVdRRC6IMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIV9Cl+cn1VGu93W/RTzlSJBpqZ5FeFOzGdmirFuZwph4NTJXOR+4Jwwptm92IaCyoxIfLbSjtT4gAdN4IKdCs
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/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/ladok3-05.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 2ac734c1..00000000
--- a/swamid-2.0/ladok3-05.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-05.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJALxYczdIErXoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEwWhcNMjIwNjI3MTIwODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8ml40V5JMkp/Jo/T3L068kjLxBS++8xG03AQ0Mhe9qc++OswQh/iHBfH36Yuq1bpBEdiXQI2huAabz0PpT7ncCAwEAAaNQME4wHQYDVR0OBBYEFKmyGb8M4HcTZS33f7dYvafhQkwHMB8GA1UdIwQYMBaAFKmyGb8M4HcTZS33f7dYvafhQkwHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBs9EFoKibKZ3ed+FXZyPtSVl+bMEXYbxMySikK7TgpbviZTiGDj+LMymUDOi3QfosfYhhMOEf35T+z2yzZR9pp
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-05.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJALxYczdIErXoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEwWhcNMjIwNjI3MTIwODEwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8ml40V5JMkp/Jo/T3L068kjLxBS++8xG03AQ0Mhe9qc++OswQh/iHBfH36Yuq1bpBEdiXQI2huAabz0PpT7ncCAwEAAaNQME4wHQYDVR0OBBYEFKmyGb8M4HcTZS33f7dYvafhQkwHMB8GA1UdIwQYMBaAFKmyGb8M4HcTZS33f7dYvafhQkwHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBs9EFoKibKZ3ed+FXZyPtSVl+bMEXYbxMySikK7TgpbviZTiGDj+LMymUDOi3QfosfYhhMOEf35T+z2yzZR9pp
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se:8445/idp/profile/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/ladok3-06.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-user-idp.xml
deleted file mode 100644
index a54955e1..00000000
--- a/swamid-2.0/ladok3-06.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-06.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAMA6qKelJugCMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODExWhcNMjIwNjI3MTIwODExWjAhMR8wHQYDVQQDDBZsYWRvazMtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL4e3Vi7JBRnwHsWM9Zyh0MxzuBFd9WdXpyKWq8mHF2e9nRb4LG7yQdNCyTIyB6PsgKEuxfzNIbIQjt1549+a68CAwEAAaNQME4wHQYDVR0OBBYEFPk26/kCLHAp5poP06UubsNnOob+MB8GA1UdIwQYMBaAFPk26/kCLHAp5poP06UubsNnOob+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBbvJcLlI/W4ZZ1qoORJPS1GWgrRaFQ/y/S9yfhmIEc6q+PbeozbaaWu5AC7gPxFQIdgbcRbs4OonV614xpXzp4
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-06.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAMA6qKelJugCMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNi5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODExWhcNMjIwNjI3MTIwODExWjAhMR8wHQYDVQQDDBZsYWRvazMtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL4e3Vi7JBRnwHsWM9Zyh0MxzuBFd9WdXpyKWq8mHF2e9nRb4LG7yQdNCyTIyB6PsgKEuxfzNIbIQjt1549+a68CAwEAAaNQME4wHQYDVR0OBBYEFPk26/kCLHAp5poP06UubsNnOob+MB8GA1UdIwQYMBaAFPk26/kCLHAp5poP06UubsNnOob+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBbvJcLlI/W4ZZ1qoORJPS1GWgrRaFQ/y/S9yfhmIEc6q+PbeozbaaWu5AC7gPxFQIdgbcRbs4OonV614xpXzp4
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se:8445/idp/profile/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/ladok3-07.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 0d955ab1..00000000
--- a/swamid-2.0/ladok3-07.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-07.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAMJtHFHhwUi6MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEyWhcNMjIwNjI3MTIwODEyWjAhMR8wHQYDVQQDDBZsYWRvazMtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN3ABXOZsCMwe16j4m9ijKy0KSbPVo7nQPrzslgJMb3hFKfv8mRwkwaPa1zVABBiiTSNt3GBj0anuPWfa/9kgFUCAwEAAaNQME4wHQYDVR0OBBYEFCPpRXGsYb8CyhNJW0SNz80h5kZ2MB8GA1UdIwQYMBaAFCPpRXGsYb8CyhNJW0SNz80h5kZ2MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQAZVBFvOI8BDPunj+PH/12CkUC+oUA28SAA4Vaf16OY0Ur9ZId3YnjHvWNnBwAQavwum/nmBGC21N6DeAmvtpca
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-07.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAMJtHFHhwUi6MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNy5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEyWhcNMjIwNjI3MTIwODEyWjAhMR8wHQYDVQQDDBZsYWRvazMtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN3ABXOZsCMwe16j4m9ijKy0KSbPVo7nQPrzslgJMb3hFKfv8mRwkwaPa1zVABBiiTSNt3GBj0anuPWfa/9kgFUCAwEAAaNQME4wHQYDVR0OBBYEFCPpRXGsYb8CyhNJW0SNz80h5kZ2MB8GA1UdIwQYMBaAFCPpRXGsYb8CyhNJW0SNz80h5kZ2MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQAZVBFvOI8BDPunj+PH/12CkUC+oUA28SAA4Vaf16OY0Ur9ZId3YnjHvWNnBwAQavwum/nmBGC21N6DeAmvtpca
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se:8445/idp/profile/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/ladok3-08.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 0287d0e5..00000000
--- a/swamid-2.0/ladok3-08.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-08.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAM0ZgHR87qcZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEzWhcNMjIwNjI3MTIwODEzWjAhMR8wHQYDVQQDDBZsYWRvazMtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANNv2n6DiU48TQYg2ns2z6Zwuofx2M2m8rUPWDAk0+S+YpxcAchOkZk3cQXFr8j97cWPh/jjQ3UWoDVNh62abusCAwEAAaNQME4wHQYDVR0OBBYEFEwsAADE8MvLRJe2JXIkjfmfa4ttMB8GA1UdIwQYMBaAFEwsAADE8MvLRJe2JXIkjfmfa4ttMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDG/JErbZ8jKMR0h1GvwPvUlrpairm66ftVDJL36XGf4v52kHLy3dXsNoXU6jhotQOj9/Vj00tShDZ6W8Hyuzi5
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-08.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAM0ZgHR87qcZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODEzWhcNMjIwNjI3MTIwODEzWjAhMR8wHQYDVQQDDBZsYWRvazMtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANNv2n6DiU48TQYg2ns2z6Zwuofx2M2m8rUPWDAk0+S+YpxcAchOkZk3cQXFr8j97cWPh/jjQ3UWoDVNh62abusCAwEAAaNQME4wHQYDVR0OBBYEFEwsAADE8MvLRJe2JXIkjfmfa4ttMB8GA1UdIwQYMBaAFEwsAADE8MvLRJe2JXIkjfmfa4ttMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQDG/JErbZ8jKMR0h1GvwPvUlrpairm66ftVDJL36XGf4v52kHLy3dXsNoXU6jhotQOj9/Vj00tShDZ6W8Hyuzi5
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se:8445/idp/profile/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/ladok3-09.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-user-idp.xml
deleted file mode 100644
index ea0d2b0a..00000000
--- a/swamid-2.0/ladok3-09.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-09.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAJAu7iyC9KhwMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODE0WhcNMjIwNjI3MTIwODE0WjAhMR8wHQYDVQQDDBZsYWRvazMtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMi4pIBl5B4ECEVUHIHDgcDAjWgyhZusmsOpOLg/GyykZgdo6+mvdEWUuUAJxxQH/3Ntm2I01JmUlsXrfRPnq/cCAwEAAaNQME4wHQYDVR0OBBYEFMFzY+T3w6f8BAHWflV3UCg2y4lUMB8GA1UdIwQYMBaAFMFzY+T3w6f8BAHWflV3UCg2y4lUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCwDlygOl0Z/MGmPu9jd++Nmc0i4+C29trVPL8d6Ctv/fVxPwylNq/+bN7ZFru/zj6OP7erlpqCDvmQWmrn8EY4
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-09.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAJAu7iyC9KhwMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wOS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODE0WhcNMjIwNjI3MTIwODE0WjAhMR8wHQYDVQQDDBZsYWRvazMtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMi4pIBl5B4ECEVUHIHDgcDAjWgyhZusmsOpOLg/GyykZgdo6+mvdEWUuUAJxxQH/3Ntm2I01JmUlsXrfRPnq/cCAwEAAaNQME4wHQYDVR0OBBYEFMFzY+T3w6f8BAHWflV3UCg2y4lUMB8GA1UdIwQYMBaAFMFzY+T3w6f8BAHWflV3UCg2y4lUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCwDlygOl0Z/MGmPu9jd++Nmc0i4+C29trVPL8d6Ctv/fVxPwylNq/+bN7ZFru/zj6OP7erlpqCDvmQWmrn8EY4
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se:8445/idp/profile/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/ladok3-10.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 0f17b6c7..00000000
--- a/swamid-2.0/ladok3-10.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-10.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAO7SIfqIQN96MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0xMC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwNjAxWhcNMjIwNjI3MTIwNjAxWjAhMR8wHQYDVQQDDBZsYWRvazMtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM4PKoyelZhhFaeKik8/87oxP2SPLwd68XxlV5VLV+klY5UB+i8zFyJlxkBSEn0tYDNvoILbrsdXwU6Q23EcNcCAwEAAaNQME4wHQYDVR0OBBYEFGViq4GYvl4YheQToC8foifV/eLZMB8GA1UdIwQYMBaAFGViq4GYvl4YheQToC8foifV/eLZMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQB4H3zJUmLN56YN4rJfhh8AwnvyezF2QXlcOu8i+DpVQv/p2W6VGWqdxYl3KxTBZsELL6TyaOSSwvTGQOkLj4u/
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-10.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBizCCATWgAwIBAgIJAO7SIfqIQN96MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0xMC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwNjAxWhcNMjIwNjI3MTIwNjAxWjAhMR8wHQYDVQQDDBZsYWRvazMtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM4PKoyelZhhFaeKik8/87oxP2SPLwd68XxlV5VLV+klY5UB+i8zFyJlxkBSEn0tYDNvoILbrsdXwU6Q23EcNcCAwEAAaNQME4wHQYDVR0OBBYEFGViq4GYvl4YheQToC8foifV/eLZMB8GA1UdIwQYMBaAFGViq4GYvl4YheQToC8foifV/eLZMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQB4H3zJUmLN56YN4rJfhh8AwnvyezF2QXlcOu8i+DpVQv/p2W6VGWqdxYl3KxTBZsELL6TyaOSSwvTGQOkLj4u/
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se:8445/idp/profile/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/ladok3-p00.ladok.umu.se-user-idp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-user-idp.xml
deleted file mode 100644
index e18d0e38..00000000
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ladok3-p00.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBjTCCATegAwIBAgIJANXpKwXKmM24MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMMF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOVoXDTIyMDkyOTExMzIyOVowIjEgMB4GA1UEAwwXbGFkb2szLXAwMC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAowQxKkq7Lom51gN/EVw3s9O+uINyhh4jGtGz3enyFbwvHrGqWPuL7wtRjCN6tc/bYk2oLGRJgDE9nRCZKema/QIDAQABo1AwTjAdBgNVHQ4EFgQUw52OrLNysL3wdCMbtuKG18Yd+PIwHwYDVR0jBBgwFoAUw52OrLNysL3wdCMbtuKG18Yd+PIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGkUTal4Z+7/W36AJbqqoVACclN8exDtfpqAJIClRl22WtB1bkQkxBRD38yrcHop3/F39KPSFlfttDQYbeqxRzs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBjTCCATegAwIBAgIJANXpKwXKmM24MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMMF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOVoXDTIyMDkyOTExMzIyOVowIjEgMB4GA1UEAwwXbGFkb2szLXAwMC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAowQxKkq7Lom51gN/EVw3s9O+uINyhh4jGtGz3enyFbwvHrGqWPuL7wtRjCN6tc/bYk2oLGRJgDE9nRCZKema/QIDAQABo1AwTjAdBgNVHQ4EFgQUw52OrLNysL3wdCMbtuKG18Yd+PIwHwYDVR0jBBgwFoAUw52OrLNysL3wdCMbtuKG18Yd+PIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGkUTal4Z+7/W36AJbqqoVACclN8exDtfpqAJIClRl22WtB1bkQkxBRD38yrcHop3/F39KPSFlfttDQYbeqxRzs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/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/nb11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nb11.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 8dfdff67..00000000
--- a/swamid-2.0/nb11.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nb11.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJAPPryjIwvi7LMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTM0MVoXDTIxMTIxMzE0
-MTM0MVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDzWb1WtFbFnJ32NQD/3sUmDR1znX4JJNpu9VNC
-Zy3Gcv1BCWjSDzohxPCF+t84+feAQpI0nzqM3+6ClaHDItfYDYCN6Ex5R/uYOfLE
-GY2roM3ppPTZnDaO+WlQ/IhQjjddykwZ/n3Qbxg73iELykx3SrM5N4Pxwiaz5rdy
-w/yKSOO4euWuaOlIjIEhRUujRqVfjzqEfPxn7YVbEHDCqtmzHAzYZMs7ykdVEkNd
-q5ZlkkrGfioLGa1gjQLkEvNEU6/JgKaCth7WXYW/FolWVf6EohXP4xSZT0N0+Gc3
-w+q7L/3EK6zuTdB2/0O61i9ZYJcQvLjOx8ipRhz9jGHIsPcrAgMBAAGjZDBiMEEG
-A1UdEQQ6MDiCEW5iMTEubGFkb2sudW11LnNlhiNodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUfvccThAXzxCuUbVLN2+adXQGOrAw
-DQYJKoZIhvcNAQEFBQADggEBAFJyo0RCytzYQEchJWy/kG4QdFuJ9zn7HQERNFwp
-xFt9OjzICqLIMcdvqBDlkoVzJBt8u0pCM/HpfpAcI3fccwkiLKn1PLhhMlKIFUd1
-61zcRzqm5mHyGWP4mWFRFc3cCQLYCkCMqZq7eLO5uwIX8z1Z775JnbIhvt6+N4PY
-SO0Dx+pl/uDMEOxA/4UJA30SNsOlEXnunmeRdER6uxRecsuE/EHSpxYyaLNqpxN8
-46pa5eUdw5NNlBDzmUGbY9SASECnuxMjQRe+CTWFWRPSBzmzxhANrOVOdx5SL6Ou
-Zhi08S0wFSiLmVBI8dLk97mWOYwJgDwmEpkeR/ng+YkH3WE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nb11.ladok.umu.se-aws-sp.xml b/swamid-2.0/nb11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index f1a87976..00000000
--- a/swamid-2.0/nb11.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP5V3e0CgGVCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMVoXDTIwMDkxNDE0
-NDcxMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDMjJnqbMwTcx+C5GfIokD01gccn0e7pTM3G3/y
-25QX9ytysMRnVlkwjU5aB7vnsN7LTpYS3rL7wCicjM+0IfKnYrj3wDpwnZ2L+6e8
-MCO48Fu4jBRv238hERLUWMEQ3u4bFId4A4SyBr8iUPDZ8ckFlapsm3SWlYHRnDAy
-8k69rykcfYrKB+T/yhhUlsRClB/EPTPsQMrRzd0kYQMO4+PsC9NZnJtSEo4cy/Y5
-T1Ys1dMqjzRQZvZPLCo03RQiFgnNhKnGY1bzh8+Sq7IkjPT5sGRcuOQTEjpXjV4/
-vC+JId7r47mwn8Wwt4x80Q5esDnhs5DTSgcDuXUt+QU77ftxAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUeKh+94BbFChCTgBUROLwBmbRQUMwDQYJ
-KoZIhvcNAQEFBQADggEBADGsIqiMYbVqvNI0oPw7JtTGhFEk2yUT1vQoTdnWjFkO
-iUmrCKQGypnzo7+1pG3FfpHOzdjqLUoutyGoqVkfzrkWqG7hwRkz0Rfp3WXS4EUk
-Goq4KuCAqgNQ8KtTyjmvZRLlp3NDARdteejMS57TcSz6Ri061L8EpMQtPqz7DJvD
-zRXz63nQAvC8QIDFQZ2rs2kMluzSdlbLVlFqpZnzqvXiJQOGxnoinjljFJsrMRYR
-kvjS6Cr4xojKjIhDb8ksQIRZVek5rFKJChkQmXaOc5ClV0Y7N9f3I7+ZjdZ5g4dj
-Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAP5V3e0CgGVCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMVoXDTIwMDkxNDE0
-NDcxMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDMjJnqbMwTcx+C5GfIokD01gccn0e7pTM3G3/y
-25QX9ytysMRnVlkwjU5aB7vnsN7LTpYS3rL7wCicjM+0IfKnYrj3wDpwnZ2L+6e8
-MCO48Fu4jBRv238hERLUWMEQ3u4bFId4A4SyBr8iUPDZ8ckFlapsm3SWlYHRnDAy
-8k69rykcfYrKB+T/yhhUlsRClB/EPTPsQMrRzd0kYQMO4+PsC9NZnJtSEo4cy/Y5
-T1Ys1dMqjzRQZvZPLCo03RQiFgnNhKnGY1bzh8+Sq7IkjPT5sGRcuOQTEjpXjV4/
-vC+JId7r47mwn8Wwt4x80Q5esDnhs5DTSgcDuXUt+QU77ftxAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUeKh+94BbFChCTgBUROLwBmbRQUMwDQYJ
-KoZIhvcNAQEFBQADggEBADGsIqiMYbVqvNI0oPw7JtTGhFEk2yUT1vQoTdnWjFkO
-iUmrCKQGypnzo7+1pG3FfpHOzdjqLUoutyGoqVkfzrkWqG7hwRkz0Rfp3WXS4EUk
-Goq4KuCAqgNQ8KtTyjmvZRLlp3NDARdteejMS57TcSz6Ri061L8EpMQtPqz7DJvD
-zRXz63nQAvC8QIDFQZ2rs2kMluzSdlbLVlFqpZnzqvXiJQOGxnoinjljFJsrMRYR
-kvjS6Cr4xojKjIhDb8ksQIRZVek5rFKJChkQmXaOc5ClV0Y7N9f3I7+ZjdZ5g4dj
-Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nb11.ladok.umu.se-dw-idp.xml b/swamid-2.0/nb11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index ff53b752..00000000
--- a/swamid-2.0/nb11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt4hfrwg5EEYqPvKY7xJY8Yh6x91BA5wySeGkxgrV4u4f/SeA7sSplotbfgm/dMumpMGdDCe+90Akv7LmKA5BXQIDAQABo30wezAdBgNVHQ4EFgQUMAkL4/7mF+SmH6G5yczScR1inoAwTAYDVR0jBEUwQ4AUMAkL4/7mF+SmH6G5yczScR1inoChIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkAv7aUZAygd/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUcesia2NZLs4YEw6073C/IpTnVf2LgeGBHjZqNnVEfRwyQBib7toqiOY0fe4H3NiP4dwvz/5DyPv7SmTbSQrU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nb11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nb11.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 88c2f137..00000000
--- a/swamid-2.0/nb11.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAOfLKjqkxYWrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA5Z8A1xR3akCeI+NjODnzoqiFHUFG8pDdw3+aO7MNa/yeRzM8uHl6aCkP6miYYH7r+soXW8tAxTaQqQjr48r00QIDAQABo30wezAdBgNVHQ4EFgQU83V36xws26bu0AS5R2SWaVx7C+IwTAYDVR0jBEUwQ4AU83V36xws26bu0AS5R2SWaVx7C+KhIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA58sqOqTFhaswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEs78Z/5GpwPeBYt0BiwkEu87yT1075ZwaEq+Z6ROI9CCVSmd7Y8P8WOMqgkQRx7ROg2vCyeNOLhhnUtEeFP6QI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBrjCCAVigAwIBAgIJAOfLKjqkxYWrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA5Z8A1xR3akCeI+NjODnzoqiFHUFG8pDdw3+aO7MNa/yeRzM8uHl6aCkP6miYYH7r+soXW8tAxTaQqQjr48r00QIDAQABo30wezAdBgNVHQ4EFgQU83V36xws26bu0AS5R2SWaVx7C+IwTAYDVR0jBEUwQ4AU83V36xws26bu0AS5R2SWaVx7C+KhIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA58sqOqTFhaswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEs78Z/5GpwPeBYt0BiwkEu87yT1075ZwaEq+Z6ROI9CCVSmd7Y8P8WOMqgkQRx7ROg2vCyeNOLhhnUtEeFP6QI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8452/idp/profile/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/nb11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nb11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index acbb6de2..00000000
--- a/swamid-2.0/nb11.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
-NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
-YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
-whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
-Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
-/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
-lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
-KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
-4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
-42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
-uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
-SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
-CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOGEddor1oZSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxMloXDTIwMDkxNDE0
-NDcxMlowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC5/PAbfjnvJOjm9Oxe74JAFbQ7zegR+b75jcHV
-YP+fiR52Lh/F/uV+hGHhz64Ynu5l0FIouU/WttTwmUu48tfVa11GJcPbRG4oOPnv
-whfVnIvky8ZpaxIEj1Ke9fvE/cYDL16QX2YD7FnttXy/EBG97XbU6EsgfEbNHSUR
-Dzk1evC9sh/njCWzQglrStOWyxjc7hW7Ex05KffeCX78MBCX1Uk7edOmVjlqbxvZ
-/i9xHg4ovT7exTX6FVlr0FCoy3980u+u06/B6SzWiL/N+AWFMi7Zce3riC9hxTQf
-lswftcduNexQ5MbT9dVmv59shAeyUcTKDXAbs2azpzQWxn73AgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEW5iMTEubGFkb2sudW11LnNlhiBodHRwczovL25iMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUjBFneivciFfdFQFKdJ9rkDNQv14wDQYJ
-KoZIhvcNAQEFBQADggEBAGMxTmoddCaGM+FIT9TeWcetsEBXwuY/7YOo7d/++fKb
-4OyByiIAnfAoYQUPEuUEJn+O0Pk4suzC/jLc0W3Vu+ih4dE1LTJLU05bayxgbqfO
-42OLoU+fuyIsxgyGsduQvaG9BYYXAVio9lD76Gi4tGAMtERjGZuvO/6l5rR7s4gU
-uSmMdeDjkBRag1Su250dylx+SZYpnL6sOe6IwZ0d00Tm2h07RepuvK6KIpkTvmBu
-SkilI6r/vLR8/Ta5S3orj63g7DEP+QF7/OLDE4wC3wkyN+Hp5AmyWM43Aqa5TQxI
-CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index ba980e1c..00000000
--- a/swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDcxM1oXDTIwMDkxNDE0NDcxM1owHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1/twTQLCDDyM2Nu2owKZTj8DmMBc9Nkv5thsGozfRhiuclQhYl2a5KD18t6VtlkwhBLVKkzgSZ1FR0qMSGvVkwIDAQABo30wezAdBgNVHQ4EFgQU1mzTQ14XwNxwMh+31WyPxJsrs2gwTAYDVR0jBEUwQ4AU1mzTQ14XwNxwMh+31WyPxJsrs2ihIKQeMBwxGjAYBgNVBAMTEW5iMTEubGFkb2sudW11LnNlggkA7ldL1An8VsIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIoeC1yFlCCRX1v68YHIGh4UNp35GnS7CFjZU69b632wSDEokaM3Rs5+SnOTfl2zLijqaDisyXzazudopZvK7Qw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index f4a7d1ae..00000000
--- a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-00.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAJqRZ/cKu+9NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTExMjAyMTQzNDE2WhcNMjExMTI5
-MTQzNDE2WjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4LFhM9idzSkquETcgbSCyGaXjh+iJ8G
-+h+0HmWxCnh3gu+7ynGWJWzdWo+4qzoLkydKpKl3LPk6fYwB3IKCrg69Fw9hK09l
-vtRHzRaGs6LShY1zhY7c8hLPHNMD7wAs5YZGYcWVpq8QHuWQzTmfKQS0D37V8Ckz
-pVSKB0/B3Z9eal/6bfd0q4b08CM5UMRmFrF+0GnLsTwMQ0zzcaZaBUZ4RQ5QJGpS
-9OtUeOTd4lX3QwlJ3vZ18xCpVWMm9YYFFHqgKvUE6/UVpJ3qwmH1wIstzDFYkqIL
-2AmZ/I+DkUDuJ/fNnKpXym0ryYk2E9Uz97JpYteXShET5OzZhVZ8mwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDAubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQeFrcMTaOuWKbF9IS8
-FawqA93YoTANBgkqhkiG9w0BAQUFAAOCAQEApUL5lhqOYzlIz/3SaxM1NgofZctX
-uJ2cwUxFeIBA0k2qtOuddI9TWOxWus+rl3CdkKhmjt19xMNIqiREe1PaffcaQ61A
-f91GBoMLmdIu09P9DdU6sklTiF6Th7P+CIOFt7QzoPA0oyXJaz13F1XFPZ4Vk/cC
-fCl7Amk1TdhwRk9LmIcqapHB0y1Zi2tE0F8hMrHivSm/jcaN4HbJ0IicoxP9VQVi
-09PN4qqu9AghuMeSdJTVGYBYHDwLUKCttIYBXPnuCVd9byK5QZFmkUDPr0IlgmbF
-IsSttJd80aXG47UxpShXBikaeFzYzUicYDwlWko91gh5zVUtL8VrVBVu0w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-00.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-00.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index fc5dc478..00000000
--- a/swamid-2.0/nya-00.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-00.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKtkD897x9WcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDY1NDMzWhcNMjAwODE3
-MDY1NDMzWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6KXK3h93ozXRe6ibnLh8cAAEH1sw9Tk
-A9ovvtt5xfd7KZ06RTQV3ipV6LIYcuev7OdbsaWL/ngDIpANwxcRUVHYK7u6LPz8
-vSRZfOOkEFcD0A909MgVzzrZUd9ZRmaaNuRlocamUr4Wlje5My6wxE+1wrwnSMJ4
-Q0+mdK/lUk250Fi+/bI93nZXA1WiToS9rvuAIBvK4jGDVEU7/6IRaZWziObBHiav
-JxpyLwPse2LJ4Q/e4/8so8w0PHv4mqwWsUwYWIH6lRIILej2xVvMtDYcxidnaa+O
-DkeOAZgshq4LMoXk6t59oAkKkNRUJ+bLPB5E3XQ7COkYK49HaQ0+zwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRS34NX+9BCRC9L4elZL6y9
-hmVYhDANBgkqhkiG9w0BAQUFAAOCAQEAGIPcySc/4YXTQoZ9xC3hRSP7Qjsxl/jV
-Icww+6vMxqunXjRzKv5eym3ih9D52nNuWJOV1QusYmqYrrGFE4JEtke4vY/tvVX8
-eFMIhz1vt0/R/p43a1V68xLFhnf6O60/D7QOa4HU7LfSNTjCOwFUJKOYFZhoyNo0
-+DbuhVFq8Ae9LzphXE+FWw4D5eXTUxl5gKCupdr5loPVruLVa1g7bxEmLppr3SBW
-1MttzgyPw0EYgC5tLw5IzYz9o3s5tm5/3dUqMHfovBQ0U/GEYBxiNq8Pq+UBvpB6
-EQCi6eLTHNmRPDAUY7W6LPbhNtXs1ieRJ8tKFug4pEjGAq7FDPCIQA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-00.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKtkD897x9WcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDY1NDMzWhcNMjAwODE3
-MDY1NDMzWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6KXK3h93ozXRe6ibnLh8cAAEH1sw9Tk
-A9ovvtt5xfd7KZ06RTQV3ipV6LIYcuev7OdbsaWL/ngDIpANwxcRUVHYK7u6LPz8
-vSRZfOOkEFcD0A909MgVzzrZUd9ZRmaaNuRlocamUr4Wlje5My6wxE+1wrwnSMJ4
-Q0+mdK/lUk250Fi+/bI93nZXA1WiToS9rvuAIBvK4jGDVEU7/6IRaZWziObBHiav
-JxpyLwPse2LJ4Q/e4/8so8w0PHv4mqwWsUwYWIH6lRIILej2xVvMtDYcxidnaa+O
-DkeOAZgshq4LMoXk6t59oAkKkNRUJ+bLPB5E3XQ7COkYK49HaQ0+zwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRS34NX+9BCRC9L4elZL6y9
-hmVYhDANBgkqhkiG9w0BAQUFAAOCAQEAGIPcySc/4YXTQoZ9xC3hRSP7Qjsxl/jV
-Icww+6vMxqunXjRzKv5eym3ih9D52nNuWJOV1QusYmqYrrGFE4JEtke4vY/tvVX8
-eFMIhz1vt0/R/p43a1V68xLFhnf6O60/D7QOa4HU7LfSNTjCOwFUJKOYFZhoyNo0
-+DbuhVFq8Ae9LzphXE+FWw4D5eXTUxl5gKCupdr5loPVruLVa1g7bxEmLppr3SBW
-1MttzgyPw0EYgC5tLw5IzYz9o3s5tm5/3dUqMHfovBQ0U/GEYBxiNq8Pq+UBvpB6
-EQCi6eLTHNmRPDAUY7W6LPbhNtXs1ieRJ8tKFug4pEjGAq7FDPCIQA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 3d482980..00000000
--- a/swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczOTAwWhcNMjAwODE3MDczOTAwWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANY0KZ8GRYywPHPb9MFyDyDQh54/V+QaGZL+JoswMKt5WUbRk1vAfNkZs3G1r+hZD/A7OpN1y1BvSlyJbS9sp9MCAwEAAaN/MH0wHQYDVR0OBBYEFK4PAAaCkwmSI6jNntGSYRxN85siME4GA1UdIwRHMEWAFK4PAAaCkwmSI6jNntGSYRxN85sioSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmVOjZUHCxT4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABub7gUiIQO2J+G5P8sw78pWegH4WPwAVXYPqkdj49vJ0R9xz2sB1o2lCz3cM2iVvXZQCtoHKM38typf1QGeG30=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczOTAwWhcNMjAwODE3MDczOTAwWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANY0KZ8GRYywPHPb9MFyDyDQh54/V+QaGZL+JoswMKt5WUbRk1vAfNkZs3G1r+hZD/A7OpN1y1BvSlyJbS9sp9MCAwEAAaN/MH0wHQYDVR0OBBYEFK4PAAaCkwmSI6jNntGSYRxN85siME4GA1UdIwRHMEWAFK4PAAaCkwmSI6jNntGSYRxN85sioSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmVOjZUHCxT4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABub7gUiIQO2J+G5P8sw78pWegH4WPwAVXYPqkdj49vJ0R9xz2sB1o2lCz3cM2iVvXZQCtoHKM38typf1QGeG30=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-00.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-00.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index ab4605ad..00000000
--- a/swamid-2.0/nya-00.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMwzb8L94PvDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKp/QDavODPCr+HiGQD6KyoM/p4lRzcpA9tkoxeCuf8AbsVmRyoGF+dBRDjCmffCEHakv/Q9tYQz0HlUtw9h3gsCAwEAAaN/MH0wHQYDVR0OBBYEFOyWIZ+7fZA1tsvSQoLie/mXQ2c0ME4GA1UdIwRHMEWAFOyWIZ+7fZA1tsvSQoLie/mXQ2c0oSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAzDNvwv3g+8MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKThR/d5AIsFFVPnsL8FnZFlgM9hBkM18tSBdmG3h8Fi3yP7DTPg4eY5eV56PyzG4rN/0cgiRH1X47kgKgDF1io=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAMwzb8L94PvDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKp/QDavODPCr+HiGQD6KyoM/p4lRzcpA9tkoxeCuf8AbsVmRyoGF+dBRDjCmffCEHakv/Q9tYQz0HlUtw9h3gsCAwEAAaN/MH0wHQYDVR0OBBYEFOyWIZ+7fZA1tsvSQoLie/mXQ2c0ME4GA1UdIwRHMEWAFOyWIZ+7fZA1tsvSQoLie/mXQ2c0oSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAzDNvwv3g+8MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKThR/d5AIsFFVPnsL8FnZFlgM9hBkM18tSBdmG3h8Fi3yP7DTPg4eY5eV56PyzG4rN/0cgiRH1X47kgKgDF1io=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8452/idp/profile/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/nya-00.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-00.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 2b701611..00000000
--- a/swamid-2.0/nya-00.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-00.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPnkgyiVy3SGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDcwODU5WhcNMjAwODE3
-MDcwODU5WjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuOTz2HgGQOUBfOqpb5FCef6/OTKD/qjX
-r86Ol36BIVB1UPLpX80jLXwX6BfXA7jFcrsuSHK/wIqvALfprP8GuEdfg4yCLxgV
-deODB+xBGMtokmzHOhbzOj2Gp9L64a1Y8M5kcpQrf1WWrNPmGH7/NIbXa7LL69vd
-GFp+fLDM15C1xryzgve686mICmxSEJbyGe6+TTxQNorTNtZ5yQGp0sgduu8diYMW
-wDe29AJzIVPnjkRjPRxitPKwxWQJPT3fbhb2Fz/V9HsddE585ydOTYjJwkMmDNgg
-fOXwPNVxRVBeJGNGf83BtanPCf5SoY2wchabMAVRcL3kLoPDlG0kGQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRbGyy2KE2LI+t+yYYmfKwT
-penTYDANBgkqhkiG9w0BAQUFAAOCAQEAHw8OjcuBB3EIlVXsVAwM+hhqISLh8LvT
-ZsGbBCWPPo5NOvle/Aa+4oVV1Gib/F+1wtJHUTwCTp+dNQadPCnzj2jcLt52x8Mr
-2aT/GHtEjHU55nIqMYyb++d9cuzDjXJdPwY7VGUrvlnSxN0VYmrG8cYZIlnaqQa9
-cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
-6qskzr18Hf3VIB1FWNi91DRxZJski2UpjveU+X5i5kSw11i3Bqhu5N04XC5SvLGp
-5lJ1W7OUkZNaCB0XnvZ6BwbvEsZ/o0Axv5ZDeoAbQjVmolThH6vzdA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-00.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-00.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPnkgyiVy3SGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDcwODU5WhcNMjAwODE3
-MDcwODU5WjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuOTz2HgGQOUBfOqpb5FCef6/OTKD/qjX
-r86Ol36BIVB1UPLpX80jLXwX6BfXA7jFcrsuSHK/wIqvALfprP8GuEdfg4yCLxgV
-deODB+xBGMtokmzHOhbzOj2Gp9L64a1Y8M5kcpQrf1WWrNPmGH7/NIbXa7LL69vd
-GFp+fLDM15C1xryzgve686mICmxSEJbyGe6+TTxQNorTNtZ5yQGp0sgduu8diYMW
-wDe29AJzIVPnjkRjPRxitPKwxWQJPT3fbhb2Fz/V9HsddE585ydOTYjJwkMmDNgg
-fOXwPNVxRVBeJGNGf83BtanPCf5SoY2wchabMAVRcL3kLoPDlG0kGQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDAubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRbGyy2KE2LI+t+yYYmfKwT
-penTYDANBgkqhkiG9w0BAQUFAAOCAQEAHw8OjcuBB3EIlVXsVAwM+hhqISLh8LvT
-ZsGbBCWPPo5NOvle/Aa+4oVV1Gib/F+1wtJHUTwCTp+dNQadPCnzj2jcLt52x8Mr
-2aT/GHtEjHU55nIqMYyb++d9cuzDjXJdPwY7VGUrvlnSxN0VYmrG8cYZIlnaqQa9
-cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
-6qskzr18Hf3VIB1FWNi91DRxZJski2UpjveU+X5i5kSw11i3Bqhu5N04XC5SvLGp
-5lJ1W7OUkZNaCB0XnvZ6BwbvEsZ/o0Axv5ZDeoAbQjVmolThH6vzdA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 0d15f3eb..00000000
--- a/swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczNzMxWhcNMjAwODE3MDczNzMxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmf57Rs0mLLo/bCWjeRD/31lxnKa+qCzbu/Kw7SuNfmrsoM8XRQZsttJ0W205vVS/KeWTD5lwvMeKt0unFqKj8CAwEAAaN/MH0wHQYDVR0OBBYEFDP6RZyMAof7vHj6IL/aqJRp92GUME4GA1UdIwRHMEWAFDP6RZyMAof7vHj6IL/aqJRp92GUoSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmF+iiXS05WUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJUO13OwzqCiSKk/JDRhWSIS1Ayzlq8dDkGzfdUcgaFtcBKwcPTBoudm1WhClGvcTAz+QTmNq9NsJurYJ3j5uQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5sYWRvay51bXUuc2UwHhcNMTAwODIwMDczNzMxWhcNMjAwODE3MDczNzMxWjAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmf57Rs0mLLo/bCWjeRD/31lxnKa+qCzbu/Kw7SuNfmrsoM8XRQZsttJ0W205vVS/KeWTD5lwvMeKt0unFqKj8CAwEAAaN/MH0wHQYDVR0OBBYEFDP6RZyMAof7vHj6IL/aqJRp92GUME4GA1UdIwRHMEWAFDP6RZyMAof7vHj6IL/aqJRp92GUoSKkIDAeMRwwGgYDVQQDExNueWEtMDAubGFkb2sudW11LnNlggkAmF+iiXS05WUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJUO13OwzqCiSKk/JDRhWSIS1Ayzlq8dDkGzfdUcgaFtcBKwcPTBoudm1WhClGvcTAz+QTmNq9NsJurYJ3j5uQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 47c3a710..00000000
--- a/swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOk5OkS88spqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxMzUxWhcNMjExMjEz
-MTQxMzUxWjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoJRopt/Q7gbXeMHHsM9eCqsa+gyx9smk
-sK6qJHlX46CLJDJ0BdqvuUL0lSkLBXh7GsRotxvq7DKUQ3m8QK4XPBUWMxFRDSMm
-becMtyjDH4puZYTZSJZ450ICBNoY9vv7WdWbyqDkzBiyewa3t8QzF7JuFGqFMvYM
-BljDKhSIOJ+l4EGCKQ3yjnFJQsnhPIuJKnHIXHlpD79gxb3Jq7y8MMIsCsl9JkK5
-AiO5XbMkWQlEMJU4FOHw1I4ZLBQrv0qjdu+IrkiD2UU51RCY7Wq4ZpjqAiBlz5xI
-my8x/qatq6tbgynJchhIIgiwxnFEJeXvP/nz2qfs3t9CTLTyzUKSgQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDEubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRUYeiHtle+jKpG/5pk
-ZUUeHzpC0TANBgkqhkiG9w0BAQUFAAOCAQEAQp+52YesKMPZUoLnAfe8aIB02HxT
-g7Lx8BIMJ4PqrBkxSwtbQEWURqHXxygohGoTPzlFJDB++4oGghwplCLvXF27YuJp
-/K5KbQ5Si/qw4KGF2+w0jnnw0mhWaMoj3+cFu5Jzfu4GK9AfcGZzOoNGUjcs5ofx
-GZ2tHONvYzKlXvsj31ky+yS4WEMCBlgIM811Yrw6P5Vfq4py7V1Le0DWfUVwBRmR
-OJxsyizOhif4JiOQYGdK4NHpby9naFNpF4IXwtagoLY6T9Gi5ktUfqSsqqTdak/6
-1pdCY3YrggXgqqubLfIBeYxczT94rwFgraZ+oNRpUXRwy9FTEXQmog8fjw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4a284184..00000000
--- a/swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
-MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
-1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
-Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
-DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
-Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
-uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
-O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
-SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
-l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
-Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
-LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
-ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
-MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
-1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
-Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
-DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
-Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
-uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
-O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
-SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
-l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
-Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
-LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
-ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 71092680..00000000
--- a/swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8St+E2ows4ZmFgCQ7iODDMX6u6C/aOPcBucV1JZJQMX57BNL41KrfXNmZ/kjTHMPC1UfdQ1p3RDxqMrIls8yECAwEAAaN/MH0wHQYDVR0OBBYEFGVdEeajVFo/b8fkRgK4sdT/wW9uME4GA1UdIwRHMEWAFGVdEeajVFo/b8fkRgK4sdT/wW9uoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAlWaJR0L/NfEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAB7g9MY3huPjsTnZiYOEMwzZG3Qojmoici2PWanNw1vYlAj0K6chV+sou9YJO7ttJ2VTcJnda+IGvmLorc7uInQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 3fd72a21..00000000
--- a/swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKA69vAYDwJaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANegZcyYM3geh+iNbBmWCfm1GxijeD4R/FHopfpxbhFYDXA9MM2lJ/c1LoZPOkzh4sZpwLqoWCELxjt/63v39+kCAwEAAaN/MH0wHQYDVR0OBBYEFH1DhE5N3yXeYWpWFEy3Hz+zb0/1ME4GA1UdIwRHMEWAFH1DhE5N3yXeYWpWFEy3Hz+zb0/1oSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAoDr28BgPAlowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKh5poTeJkNsHSlhyDcRdDKFXbsBNjOSC+mu4IqOmAp9wUWzxVVeWVAjBS1etVaWSY6Zyfo4W8lA4ybDhuIy2vc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAKA69vAYDwJaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANegZcyYM3geh+iNbBmWCfm1GxijeD4R/FHopfpxbhFYDXA9MM2lJ/c1LoZPOkzh4sZpwLqoWCELxjt/63v39+kCAwEAAaN/MH0wHQYDVR0OBBYEFH1DhE5N3yXeYWpWFEy3Hz+zb0/1ME4GA1UdIwRHMEWAFH1DhE5N3yXeYWpWFEy3Hz+zb0/1oSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkAoDr28BgPAlowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKh5poTeJkNsHSlhyDcRdDKFXbsBNjOSC+mu4IqOmAp9wUWzxVVeWVAjBS1etVaWSY6Zyfo4W8lA4ybDhuIy2vc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8452/idp/profile/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/nya-01.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-01.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index cc4fba97..00000000
--- a/swamid-2.0/nya-01.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-01.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMffz/0eEqtyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0
-MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKXqK5zu7Ksbd8NjQ19iDeLjvc0bMC1t
-zWTGm5HGZ3ItTLbFpBTq1IPdC4PBvcBe90e45UJPBNjs3LOwVpA69WYcOYG945k8
-fMxp2G2v3eW3wlfV3SarXhUJdQ/Dl8G9HQ7mzErYquGYT+N+lyMVMxPUhF2QKZhp
-xuLGnxTJZ4VRwsuNHz/wgLt+akSkKtUhYsoA8TuB29dWOGPyufYEEEJjDYU1n4XB
-3+wDAZbSYNBmbx4xB+n7WhGqezbc1zeGcTTjvgYVNnhzjWJZDXyd04fwoKWfdmFJ
-AlPHAKpkDrF3dsR69rXFuz3vuAPexxKR4oN3t/KAHlLaXstjBCymQQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQhXbsn941U+ujVF8HYBuIl
-I8bLmzANBgkqhkiG9w0BAQUFAAOCAQEAAUNj/MZSJ7Pl3V/wZP9mIcsVmYthr7CA
-gvJW/Zlxb8wJ+bnKUzBK3M5hLW8kBqYvLQVUmulKKILvAwQv7+hbFUhN1MQ7Cszt
-45vQLgAtAA3qloE1ooF39ZnJ+/KP4XYXkyXPUxfVo3bFBlVvjTiyzU7ztv5+pmUL
-HYNklLq2eVXHz0Y0K5O8+hxKif/djSlfqIxRUDBApyMDNAfWQ/wM46HymJ2lvy86
-AI+FDbWK2JMyabvHDCle9P/z0aY1g4u1xlq3Bej7OUXFuRQl6cAxvU8AvPJ7VLE0
-qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-01.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMffz/0eEqtyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE1WhcNMjAwOTE0
-MTQ0NzE1WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKXqK5zu7Ksbd8NjQ19iDeLjvc0bMC1t
-zWTGm5HGZ3ItTLbFpBTq1IPdC4PBvcBe90e45UJPBNjs3LOwVpA69WYcOYG945k8
-fMxp2G2v3eW3wlfV3SarXhUJdQ/Dl8G9HQ7mzErYquGYT+N+lyMVMxPUhF2QKZhp
-xuLGnxTJZ4VRwsuNHz/wgLt+akSkKtUhYsoA8TuB29dWOGPyufYEEEJjDYU1n4XB
-3+wDAZbSYNBmbx4xB+n7WhGqezbc1zeGcTTjvgYVNnhzjWJZDXyd04fwoKWfdmFJ
-AlPHAKpkDrF3dsR69rXFuz3vuAPexxKR4oN3t/KAHlLaXstjBCymQQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQhXbsn941U+ujVF8HYBuIl
-I8bLmzANBgkqhkiG9w0BAQUFAAOCAQEAAUNj/MZSJ7Pl3V/wZP9mIcsVmYthr7CA
-gvJW/Zlxb8wJ+bnKUzBK3M5hLW8kBqYvLQVUmulKKILvAwQv7+hbFUhN1MQ7Cszt
-45vQLgAtAA3qloE1ooF39ZnJ+/KP4XYXkyXPUxfVo3bFBlVvjTiyzU7ztv5+pmUL
-HYNklLq2eVXHz0Y0K5O8+hxKif/djSlfqIxRUDBApyMDNAfWQ/wM46HymJ2lvy86
-AI+FDbWK2JMyabvHDCle9P/z0aY1g4u1xlq3Bej7OUXFuRQl6cAxvU8AvPJ7VLE0
-qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 65a38e0b..00000000
--- a/swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE2WhcNMjAwOTE0MTQ0NzE2WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO1lQDnl0bxCVZq11BQ9jbhVOGnluawebNtuHzhiyCGCrHC/5415JK74ndTViCWAXk7iwmEZCl4F4G+aRfM+WvECAwEAAaN/MH0wHQYDVR0OBBYEFNWAeqek2M3vAjhUwHB2ov9SJ8gzME4GA1UdIwRHMEWAFNWAeqek2M3vAjhUwHB2ov9SJ8gzoSKkIDAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlggkA8dK0zVjJcAYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALf0n4ZwoqomgBnNuvLHKwNC1rMx2ldFQQjd+be3L9Tny2uph/21A+n89d5D9lb+Me8iMeci5Mfj00ZZHtceZ14=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-02.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-02.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index f61730a3..00000000
--- a/swamid-2.0/nya-02.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-02.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKXVhLJyociEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxMzU0WhcNMjExMjEz
-MTQxMzU0WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvJyxiz31qltQvzgD9UfRwpRQ7TrVmLc2
-+TwYpJaGCKW/go3T3ePa5eBAG1EEiJ25079O8iVEZ7U1VAynT6gfzQgycOOXvqpG
-SZ3kW10u9mw+nxaLJvDr7zo4Iw2pgGJwIxQ3Zr90pdl21AbsqIh8p2U5ob0YDdNC
-0Bu7qNhnuzalaprls11D2gJO41g6hk/poFFpw4WE2suE58d/OM6zT8+AvqxYIF7g
-u4Q7cop579f9dSQkIT03SJWycP7DT2rVkBdmVDScL2sUgoKz0bBdHLf60d2MJ4KM
-P82ltPeigfVE2OxZpO+26Y8xvEznSBas+djKEctdpMvxLpCUFozRwwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDIubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRohgptcvwggHaIcZtZ
-zNIcSH1K8jANBgkqhkiG9w0BAQUFAAOCAQEACDFsBFw/b+bFMZ6iLWaKh5sPeJ4t
-5FktV+KpErjhlb6TDchDbONhGqtPaKhDOOCWF2ixzYHGlwRchoaPdrQg3aRJYgDP
-mhouFGuZ2OMVcAkuY8zYPPlKoitud4lvCsNJZJx3Kf9fIYcQsqRXZrQh8Liucsl2
-3h5XwymthqqodNBzq7gWJkuVRU4t5HJzsqXAhaBMrPq8DmtCKzGbcLoRE35GloRV
-U/aML0q3unInrJaFvNeTZuOFlcJ6rKhm/FU/gPXYAtYaiPpuiyohjmysiM33Uf9d
-N2E7dJ3CyH08jBFitMrgOIexNlMw697ne4jPm+Iv9iJU3BOiVGWLDa6EMg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-02.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-02.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 2aed647e..00000000
--- a/swamid-2.0/nya-02.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-02.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN7BNw3tiCo+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE4WhcNMjAwOTE0
-MTQ0NzE4WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QlMp1taZN515+zgP1/I6XB7T8Toy9hN
-aMla/6da9v9CrvyoRsS4sVUJJWukOYuDmjuu0/VeTky4xokbdGvppnJQ3qCESXYa
-tAaRJ7JwGCgYXSKwz47V334pLhccC1vuc1lKQK/l/mb61pP6mMigGQzsvqZ8clOK
-9mlzKYb9z3OSVoiEVxmufiQzr/voCA7hbxzVteTVRpXa8EhsT3MqbFALdK28yRAW
-wbMJ7wDcGpe/ZllcdluaCuy6Oivu+pqoc/UXg2n4NLb5BDGQ5NPL8sG+QLf3BY7y
-37VCVNtevGku3qxt22Nf4/MhBCKOpAHgSqrcd4g7JmcDHyHJlLwD6QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSahQyE6hlnBumO2v/3LeRD
-tRP0tjANBgkqhkiG9w0BAQUFAAOCAQEAot7Hnv+FPLq3RazG6NIsuJLWVY4HHzCl
-bxsUCeYeOtRcLUT0uRNVjblOoWbuJMhdS5z/JShm2EY1C2SgaCSPgUoGSL+aN30E
-74B6sBM9XqFnYQePV4++ZQOHgltT6eO2xsrDnX2uWh4IzT1p2/VK61eCABDMSytr
-XG057zY+BKFAYPp5EYOKN87NidYl+8cqskX55ZP6hDkDNsn5uzTpunCDJDWGVcBf
-XrQkZ6UTzns3wN056dfJ6Cp7HLa0scF22OBGun3AOETiszaMJNnZ9q8fDZ0MXCQf
-gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-02.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN7BNw3tiCo+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE4WhcNMjAwOTE0
-MTQ0NzE4WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QlMp1taZN515+zgP1/I6XB7T8Toy9hN
-aMla/6da9v9CrvyoRsS4sVUJJWukOYuDmjuu0/VeTky4xokbdGvppnJQ3qCESXYa
-tAaRJ7JwGCgYXSKwz47V334pLhccC1vuc1lKQK/l/mb61pP6mMigGQzsvqZ8clOK
-9mlzKYb9z3OSVoiEVxmufiQzr/voCA7hbxzVteTVRpXa8EhsT3MqbFALdK28yRAW
-wbMJ7wDcGpe/ZllcdluaCuy6Oivu+pqoc/UXg2n4NLb5BDGQ5NPL8sG+QLf3BY7y
-37VCVNtevGku3qxt22Nf4/MhBCKOpAHgSqrcd4g7JmcDHyHJlLwD6QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSahQyE6hlnBumO2v/3LeRD
-tRP0tjANBgkqhkiG9w0BAQUFAAOCAQEAot7Hnv+FPLq3RazG6NIsuJLWVY4HHzCl
-bxsUCeYeOtRcLUT0uRNVjblOoWbuJMhdS5z/JShm2EY1C2SgaCSPgUoGSL+aN30E
-74B6sBM9XqFnYQePV4++ZQOHgltT6eO2xsrDnX2uWh4IzT1p2/VK61eCABDMSytr
-XG057zY+BKFAYPp5EYOKN87NidYl+8cqskX55ZP6hDkDNsn5uzTpunCDJDWGVcBf
-XrQkZ6UTzns3wN056dfJ6Cp7HLa0scF22OBGun3AOETiszaMJNnZ9q8fDZ0MXCQf
-gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 84360c8c..00000000
--- a/swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIwWhcNMjAwOTE0MTQ0NzIwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMCgqGYz2TiqNGwESnHlrNzoINh8Zd4yLrdKEMymwxlfGrGdQ4JEIOHNjgmIcCq6YzOxqA4RQV8V53RNe/A1KqUCAwEAAaN/MH0wHQYDVR0OBBYEFD1Chcppe53Jic6xoaU+b3EvJxpQME4GA1UdIwRHMEWAFD1Chcppe53Jic6xoaU+b3EvJxpQoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA3ohIMBlIjrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACpIcMxa7BaMOTM6a99QVdGsy43yjIbTSbwOiEX3Hu+X+QIcPkrEQL//Qst/12YWEeUuzPbQejaUPTlvJYGLd5Q=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index fbc50826..00000000
--- a/swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOIyb07ec7AZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANX/PPn9NJHNR/QEBb3LIXx5NaHvO0ZtiQEtZBNQ1+rAFU5+GFCH885VAPllP1vSNG0mrvdtQ+kO3b2gwsdWlGkCAwEAAaN/MH0wHQYDVR0OBBYEFIJjGVQxRH3EsnjNvRF3S6Arf32NME4GA1UdIwRHMEWAFIJjGVQxRH3EsnjNvRF3S6Arf32NoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA4jJvTt5zsBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANUcGE0y/zBNlbBaB+mnlhHT5Qrby63Aw+wRO10AJFTc1cAKRaw1F8fPxkFwqCXjYx66tFTuO2Gdqj2CMI/KTS4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAOIyb07ec7AZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANX/PPn9NJHNR/QEBb3LIXx5NaHvO0ZtiQEtZBNQ1+rAFU5+GFCH885VAPllP1vSNG0mrvdtQ+kO3b2gwsdWlGkCAwEAAaN/MH0wHQYDVR0OBBYEFIJjGVQxRH3EsnjNvRF3S6Arf32NME4GA1UdIwRHMEWAFIJjGVQxRH3EsnjNvRF3S6Arf32NoSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkA4jJvTt5zsBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANUcGE0y/zBNlbBaB+mnlhHT5Qrby63Aw+wRO10AJFTc1cAKRaw1F8fPxkFwqCXjYx66tFTuO2Gdqj2CMI/KTS4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8452/idp/profile/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/nya-02.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-02.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 90443ec0..00000000
--- a/swamid-2.0/nya-02.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-02.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
-MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
-yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
-+YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
-eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
-wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
-NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
-KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
-31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
-xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
-QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
-fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
-lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-02.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3o/cGztHzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE5WhcNMjAwOTE0
-MTQ0NzE5WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Se4UsAYlrJML+64RMKxcmLy+d9/ixET
-yVWHrq0EbIBOyHasqQyIpiFmVmA7rHCIDCrt97pEgOMUbDX2O7ERNlJkAeS0Mn5s
-+YqBdw4TO4IfNgOZ+VDgHrlfVfwEAXsbciVWrVhCl2DxjuH97zsBP3X5L3EL76Bk
-eO52aUnoomhk0W58Aean/vYExIJNhJ5KTB/l5+yQrzb9jPhCLojoWxkFZw9YwpDD
-wY9vXiHLYV5lnxGumexLPRNS431ZdTK3lQHufNUGcsCXuzfQlc4AhOShl+gL8UVk
-NhiXzmWADuV+TEY6XxPi28S4qwixsuq4Ru8Z9jPIp6RSfJYjXGdDmwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDIubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRER/XM1kOU3OLa+Z428fpJ
-KCWDIDANBgkqhkiG9w0BAQUFAAOCAQEAYLMTbmo4PBtUZRCHy4iqqIXkoVY/9BTa
-31m7huEnpoYJPgtIrhxJAOCMQAnrG2aDg9jaVULaDYkdWX9EQkqAOIMH8J3iPe2x
-xr1P94+XDCRcJ0PqvWvtCqQTeMFFfDAA5cwaIaWtBRb+zD1L3G3gy2d2KeBm+ew4
-QmM6Ua9R5vYd7f1h/gLO6G/0Hj+Sl/AzzYtn4CUWMu+4mjxfONKGIpAkStuOZg4w
-fOkcNxjPCqUlgwqdF3sQSY8Rza/r3nqzLyba35r2HFflRW6yksSazFVf4k0xGPGr
-lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 22b5e760..00000000
--- a/swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIxWhcNMjAwOTE0MTQ0NzIxWjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlPO/bUgKsqidBMP+QLvqdcqCLUGMjDFLE+H3o1/abxPi49RTwXEIXOyoIRd/tDjsgM8XYTVSzolv8Td+6Ygs8CAwEAAaN/MH0wHQYDVR0OBBYEFJOqIpJWnj9nW3zLY4M5bLQXlc3kME4GA1UdIwRHMEWAFJOqIpJWnj9nW3zLY4M5bLQXlc3koSKkIDAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlggkAqOjpWbfNg9wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0y/JU1M5dQoMjCu2/9OxRClDUpbLx1AwEL4ZHzp/NN+OeZ5ci+3fh6ZSIhob5q9z28MQF+Ti4qNAy4R4BH+/o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-03.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-03.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 9f28564f..00000000
--- a/swamid-2.0/nya-03.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-03.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJANzDByXW3A0VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxMzU4WhcNMjExMjEz
-MTQxMzU4WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA152HWqXt+nWNSuoWp/qjt+VHq0Obj2wH
-6lFb77Ewc7DWh9DbI2V5rejH+aOSOO9QaTCsJGMiGFblf/gTrmYvstjkW8GXioAX
-X8xbO4qt19BajQPOuWs1euzYWLaxSMpMMmcl72IO3Y9ut1Uyoty0LojNAY4Tupx5
-5M8BhKOzHLXOM7lMF/F+zkQSaNGKXSdr1i9NeIdHSDXKYkjMQc9QfzfDGUpCeb1Q
-IoJ8vZaIIof2cFXXtTyWK+BxoOsEpOayMIMjIIYnEkhDX0zkYDpbJc9BEu3j1ngy
-fMeoj/d21e2vd9y0dpQk9b1SHzqSOSk6xEa29QhxM/v+eq/3IOOAbQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDMubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSztmCIgKskxWf5MvOf
-yrwUzvXX8TANBgkqhkiG9w0BAQUFAAOCAQEAGa0gOt9MGmy7KQ2Z0quHbRB9Dn2m
-imJwwFX5dNmMaigyqFikwFgBHnFVg5VHt/Pivq2YqdS2pPGHvOiuJYypq3WXBkT5
-+PqN2NQ4oJpp2KO/svpRD7tZI411KSyTU8OobHaXX7IOKhHHFS59SyGKYhBDO1Gr
-8S+aj1+L8NbIJbsFnjDAF6RiAq07ofKLvIGyThnHDOwMYm/1oz4Tc8zNY3ipd/aP
-5gRrweSym4lt2j58eebxQY7GzIO80oFMSAVVkKQHVIUUjrL/Y/lDoZKS+ab+Hdu+
-xxsec10MaM5LRhAHDZrDVPMp/Q6JMCK3ZMvX1WyhhGdENT5CKTOwkoXa2g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-03.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-03.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 44578932..00000000
--- a/swamid-2.0/nya-03.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-03.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO4S8REyHyj6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0
-MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA50vdahPq/rlI+9MIEgQNOfpn2n7WWt6s
-ZnIjGU0mDkLybFnFgBDrqKnwcFjNiIv6oNblbDTSVOrlT3uI9QgB/+gEt+/1k9ZA
-h9v3QS7PJDABX/2KJvYIZC+ECiCBW3G0Z3eb/EGurRuhiQOw3icQX34SwaCcAQII
-2EBCilEe6UMYLHNE+KmyzEZ0RtS6ZXpzceF6Nsw4bDVa7SM4Wxr5LqaEk/ddqW+T
-Gj4bdyN/EsQCs1EyNVEarDqPqU/Z8pmNff1huOBOSYGqHXaHF4ND2oORfoN/k0ZJ
-NCZgc9G2vKqqyKyLM3jlz2u6jUUHn57ysJ0ZvPT8efhtws1hwPLBFwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQMZlnHTtYu0s+k4n1xRN6R
-T/D9TTANBgkqhkiG9w0BAQUFAAOCAQEAGX9PiAf9YmSyl030FFBGOafEFtBGsrDj
-OKIU430pNF+1nPBPpG1T3bWDqlbJ2OkgXj5Xc5jmUeL/SLqjQGOpznvhgp5AXxiK
-0ZQQE+Y3n3N9cQxDDvHABj80fpebsSj/QGM4coCBCT4bLcDhcDlAgdx7t9bSl9Bl
-2eKofO5SdcXUynpHMZCirmmty5rHp1KG8bHJFEfefg1v8vlpBK0+mCbeyojPQ6Vx
-IVcTUg48nFg+NAnWLNVjRyopVXtzr2alMFNifC/FnbL/beYpKhzWraxoLacFRaqY
-VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-03.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO4S8REyHyj6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0
-MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA50vdahPq/rlI+9MIEgQNOfpn2n7WWt6s
-ZnIjGU0mDkLybFnFgBDrqKnwcFjNiIv6oNblbDTSVOrlT3uI9QgB/+gEt+/1k9ZA
-h9v3QS7PJDABX/2KJvYIZC+ECiCBW3G0Z3eb/EGurRuhiQOw3icQX34SwaCcAQII
-2EBCilEe6UMYLHNE+KmyzEZ0RtS6ZXpzceF6Nsw4bDVa7SM4Wxr5LqaEk/ddqW+T
-Gj4bdyN/EsQCs1EyNVEarDqPqU/Z8pmNff1huOBOSYGqHXaHF4ND2oORfoN/k0ZJ
-NCZgc9G2vKqqyKyLM3jlz2u6jUUHn57ysJ0ZvPT8efhtws1hwPLBFwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQMZlnHTtYu0s+k4n1xRN6R
-T/D9TTANBgkqhkiG9w0BAQUFAAOCAQEAGX9PiAf9YmSyl030FFBGOafEFtBGsrDj
-OKIU430pNF+1nPBPpG1T3bWDqlbJ2OkgXj5Xc5jmUeL/SLqjQGOpznvhgp5AXxiK
-0ZQQE+Y3n3N9cQxDDvHABj80fpebsSj/QGM4coCBCT4bLcDhcDlAgdx7t9bSl9Bl
-2eKofO5SdcXUynpHMZCirmmty5rHp1KG8bHJFEfefg1v8vlpBK0+mCbeyojPQ6Vx
-IVcTUg48nFg+NAnWLNVjRyopVXtzr2alMFNifC/FnbL/beYpKhzWraxoLacFRaqY
-VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 0f6809fc..00000000
--- a/swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTE5MTIyNDI2WhcNMjAwNTE2MTIyNDI2WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALkPGJdT2+8T/Tm5sEsm9Xtey1o7tzveQvmX3I8iJ89AdD2u7ZUNp5WNQv8/q0D2l+dU3TC+Zo3gPRzrL9rFWG0CAwEAAaN/MH0wHQYDVR0OBBYEFD+i/0toSkdU7jydFxT3Isa+PFIaME4GA1UdIwRHMEWAFD+i/0toSkdU7jydFxT3Isa+PFIaoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAhAzBsjMYSWIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADN2AhE4tEt2aTScozETDBHxPpKa0Tb6qr6Z71nYmm4a+EdL2D7rQuxtE1M9sn8RJ2dw+xrsTsMQv0TzER2N6ZQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTE5MTIyNDI2WhcNMjAwNTE2MTIyNDI2WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALkPGJdT2+8T/Tm5sEsm9Xtey1o7tzveQvmX3I8iJ89AdD2u7ZUNp5WNQv8/q0D2l+dU3TC+Zo3gPRzrL9rFWG0CAwEAAaN/MH0wHQYDVR0OBBYEFD+i/0toSkdU7jydFxT3Isa+PFIaME4GA1UdIwRHMEWAFD+i/0toSkdU7jydFxT3Isa+PFIaoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAhAzBsjMYSWIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADN2AhE4tEt2aTScozETDBHxPpKa0Tb6qr6Z71nYmm4a+EdL2D7rQuxtE1M9sn8RJ2dw+xrsTsMQv0TzER2N6ZQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index d6664c62..00000000
--- a/swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK4kQYQVeuXFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV2djMup7U/4sYkuvCVD0Xowha7nj1U17i60MnvlUofYV22mvXkLqfljpU15g+91XIcxt3zl63YT2j1ioFrqukCAwEAAaN/MH0wHQYDVR0OBBYEFAKHV7McxE3XJqigJ+uf5j8DpHnCME4GA1UdIwRHMEWAFAKHV7McxE3XJqigJ+uf5j8DpHnCoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAriRBhBV65cUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADes7T57r0fxSfBmiM4Ne6X+i5QTRVODVkoUSsOjFE0Sr/gfuApjkePx5s5gcCGPx9v9wV5enUKv77qJJ9HjLCU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAK4kQYQVeuXFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV2djMup7U/4sYkuvCVD0Xowha7nj1U17i60MnvlUofYV22mvXkLqfljpU15g+91XIcxt3zl63YT2j1ioFrqukCAwEAAaN/MH0wHQYDVR0OBBYEFAKHV7McxE3XJqigJ+uf5j8DpHnCME4GA1UdIwRHMEWAFAKHV7McxE3XJqigJ+uf5j8DpHnCoSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAriRBhBV65cUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADes7T57r0fxSfBmiM4Ne6X+i5QTRVODVkoUSsOjFE0Sr/gfuApjkePx5s5gcCGPx9v9wV5enUKv77qJJ9HjLCU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8452/idp/profile/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/nya-03.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-03.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index e40a6b86..00000000
--- a/swamid-2.0/nya-03.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-03.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALK7u4Fz/80MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTIwMDcyNDM0WhcNMjAwNTE3
-MDcyNDM0WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA05Rt5nZbYGkPTb5bGXNj0/U6BmjziVoP
-sNuoB/XDOz5xK6gTu4RHcfjXMPI1mnC4u1h2yAr9tCVhXs2inBo3rJ+y8/ElwIF1
-mue6aIkggPkmtHv6WHzgzkUvqe4id82sokpuG/bBmN2C0OF4sghI/jEYT6A7HkkO
-4F2LiXvwFOHGbUiZSPhlylE8qaooOaAXI+GK6YgXBAsNp6nXPmjHgVqaYNvLxV10
-owAXVaCrKCSeM00kkpWtlwlxkSOBqDUBBucyPhqN3IBhv9JAdCJ/DB58PFYJ2Xqo
-mh6LzzFSpznQYWp/q1fvWDgkXnXKZ3vjWTS5GSglSZDOSaQl80ir+QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR2l5jsL4fbPNHBeJLEhJ8S
-eAUpHTANBgkqhkiG9w0BAQUFAAOCAQEAtfR4vZI1bbKzNrm8TwPwkVcHYOpVMoIA
-O9Zx2nj+vSZG/YuIa66TN54021JaPABbdoMcJTd9j+xFhEZTCVWr7UrhLwk+e9dO
-9MQKifI3clrlg8QPEqHqTao+EbzA4qS3V66McFN0sBIbDBw1ytm3phLXuvNKoQBT
-9NbMBZFEgWPT6Z4dCBx9BjCnLQEgwdqwd60g8z6ksvHUF2Kk8BdiNyoAcqbpb7tF
-83xkbNErea0Bu50mYdewcpxxaVEyfWnC5ZE2o/W09zznziFJ5XRj92fgomfFVysc
-u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-03.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALK7u4Fz/80MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwNTIwMDcyNDM0WhcNMjAwNTE3
-MDcyNDM0WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA05Rt5nZbYGkPTb5bGXNj0/U6BmjziVoP
-sNuoB/XDOz5xK6gTu4RHcfjXMPI1mnC4u1h2yAr9tCVhXs2inBo3rJ+y8/ElwIF1
-mue6aIkggPkmtHv6WHzgzkUvqe4id82sokpuG/bBmN2C0OF4sghI/jEYT6A7HkkO
-4F2LiXvwFOHGbUiZSPhlylE8qaooOaAXI+GK6YgXBAsNp6nXPmjHgVqaYNvLxV10
-owAXVaCrKCSeM00kkpWtlwlxkSOBqDUBBucyPhqN3IBhv9JAdCJ/DB58PFYJ2Xqo
-mh6LzzFSpznQYWp/q1fvWDgkXnXKZ3vjWTS5GSglSZDOSaQl80ir+QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDMubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR2l5jsL4fbPNHBeJLEhJ8S
-eAUpHTANBgkqhkiG9w0BAQUFAAOCAQEAtfR4vZI1bbKzNrm8TwPwkVcHYOpVMoIA
-O9Zx2nj+vSZG/YuIa66TN54021JaPABbdoMcJTd9j+xFhEZTCVWr7UrhLwk+e9dO
-9MQKifI3clrlg8QPEqHqTao+EbzA4qS3V66McFN0sBIbDBw1ytm3phLXuvNKoQBT
-9NbMBZFEgWPT6Z4dCBx9BjCnLQEgwdqwd60g8z6ksvHUF2Kk8BdiNyoAcqbpb7tF
-83xkbNErea0Bu50mYdewcpxxaVEyfWnC5ZE2o/W09zznziFJ5XRj92fgomfFVysc
-u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 5f176115..00000000
--- a/swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIyWhcNMjAwOTE0MTQ0NzIyWjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOwmAz1qcHNgsaDh4QtPmphHkJCM+e/4patu3H2ZIqfTXlHHrIdTz81lcWHmm6vPoyGAzLji2wLWRMmaNrQAY3UCAwEAAaN/MH0wHQYDVR0OBBYEFDDYk7/5+5qaQxuxhF+EtGpUxXH8ME4GA1UdIwRHMEWAFDDYk7/5+5qaQxuxhF+EtGpUxXH8oSKkIDAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlggkAm88t79pnBxUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBANwIBt+Pos4L1glckZuhhfHeRoDfJy9hvOI9r50u2dmag2MwgyGdNrCk7+CGABbSbCo0+IyOwrTad6ASdCLEs4A=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-04.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-04.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index cd5697c9..00000000
--- a/swamid-2.0/nya-04.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-04.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAN/pNKqjnQl4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDAyWhcNMjExMjEz
-MTQxNDAyWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0UhO3OFE3rJBO8gD1fdA4liGoigs3o7J
-PI6RJEroLXs63xjLq/NtEEW9/Hycz9J6PX/+/Lj01K5j4MVGZ8H5fv7KMZeVsjU/
-PiMHlu2h6GAYZSUuhkantNSAfzwplZPHt8wJVWk915GM+obfhpQrZJ0DghC5ZYU6
-BmDEZLX142aZdcrHfO89pfFu3Jgh6HnCjTGdVegn0ty28q5hBjUoqlplzALOUnYr
-S4SojmOTU46llGn+rRmKbXjUEuUcwPDGezKYqOY7Jq45MakrzEYXDOyCtZGrpIYL
-zmR94m1HSDBXUrff9uVNjbURAOa6Ol/r7EiiatJGTunbXgJYphjzTQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDQubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRTt1w4nUHCJjvCf+vS
-tq6u2WaHgTANBgkqhkiG9w0BAQUFAAOCAQEAUYHtfw/rlrRrWkTUWxtVapK9SRXT
-lgpW4uxKOSSAQdDgE6Nexq5K3VVnMOqBt1myIasDWzMVniZ9wGs4apxzewGFg2+i
-y/4NcKmdNV7gLYLjemUebnS0ea6uSLih3CA/hyOV3oeR5eSLKG/xEFYPAmqg/6Er
-JCXw/VmZV7H4b9Y1CSCe+4WTH6mAlh8Zm9brdbGSoLgQNiaUN9XsdhIle94KIXej
-sxSk50S1ljwxYrguwYfQP4dPEB1mn9oBIwGA+MFfXOch5YIYWYhdhS8JKD+33e1L
-yfok40PeW6wNzSsPTbDuXCg5ylpa6erNDbWvovVYM6DNUpN0u4slj2kn5g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-04.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-04.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index aaa93700..00000000
--- a/swamid-2.0/nya-04.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-04.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM9R6dfKEI8fMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIzWhcNMjAwOTE0
-MTQ0NzIzWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzOsnWCC9QPB6NqxFVXVVZ02wyZs126v
-LmDC5x9cjHKIRrLuqplfA0VAiDCctYGYByu76qSCozW0UDpTQyT72g+upLBs1t6q
-jAuEPyEZHmQlT2PbDLAncVcyXyye2VDOC5MH9x2DM2qbfkCbl9mYiV7KlJxYM4+5
-AHhDqC0gmQwEPPXm3p8/6QfhjpOo3t8DOOIfGg2uWyNYvq1LO+ESm+pqmIMnuJi7
-hwqnFZTG3rVeDc3vViu4qgu6JoCSJ1M8hvwSXrTDoOWVJ8WZ0mjP1yGrCyPqbuDF
-UvUGRfOCYxuk9cJxjymAgTqXEj50cuvbwQDr1EcIzMeBO5TnWfSFIQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPLdzH3b575pAhUQ8nRXPe
-NchkGDANBgkqhkiG9w0BAQUFAAOCAQEAPHndzXTA2q7jDWp8J6oZwmxhkgrrZ5jj
-Tdqb9qVDS8xo4G3/WwovHvkmaTJyZ+6DAY/1Iy/ac8yii213/Ys1pPPICs5crrl/
-aSbqE/XChUbBtKqw2cCoF8uO4DCF56DMyJovKR4Fv+6Kz5tTbg7qKkKoiKDVL9oz
-mGubID6o3Q2kAIS3QRvABPUNin1QQv8LZm9pYv1ZCY68+wIX20sjvPlEXbRAfNVz
-ZbC+BKgbWTrpFNO2QGEL8ANtLJbHBf6eU3LqHldSQgRcogD291DiE3QbMn21vdsp
-nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-04.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM9R6dfKEI8fMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzIzWhcNMjAwOTE0
-MTQ0NzIzWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArzOsnWCC9QPB6NqxFVXVVZ02wyZs126v
-LmDC5x9cjHKIRrLuqplfA0VAiDCctYGYByu76qSCozW0UDpTQyT72g+upLBs1t6q
-jAuEPyEZHmQlT2PbDLAncVcyXyye2VDOC5MH9x2DM2qbfkCbl9mYiV7KlJxYM4+5
-AHhDqC0gmQwEPPXm3p8/6QfhjpOo3t8DOOIfGg2uWyNYvq1LO+ESm+pqmIMnuJi7
-hwqnFZTG3rVeDc3vViu4qgu6JoCSJ1M8hvwSXrTDoOWVJ8WZ0mjP1yGrCyPqbuDF
-UvUGRfOCYxuk9cJxjymAgTqXEj50cuvbwQDr1EcIzMeBO5TnWfSFIQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPLdzH3b575pAhUQ8nRXPe
-NchkGDANBgkqhkiG9w0BAQUFAAOCAQEAPHndzXTA2q7jDWp8J6oZwmxhkgrrZ5jj
-Tdqb9qVDS8xo4G3/WwovHvkmaTJyZ+6DAY/1Iy/ac8yii213/Ys1pPPICs5crrl/
-aSbqE/XChUbBtKqw2cCoF8uO4DCF56DMyJovKR4Fv+6Kz5tTbg7qKkKoiKDVL9oz
-mGubID6o3Q2kAIS3QRvABPUNin1QQv8LZm9pYv1ZCY68+wIX20sjvPlEXbRAfNVz
-ZbC+BKgbWTrpFNO2QGEL8ANtLJbHBf6eU3LqHldSQgRcogD291DiE3QbMn21vdsp
-nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index ce726469..00000000
--- a/swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMWTF5dJ1wXeocm4D9hI7vnShARfhBMHtEhnj8SbrlVJxEcmMktVyXdMyzuozL50QaAjvIvrwW7x8C4pQ6WLXF8CAwEAAaN/MH0wHQYDVR0OBBYEFGdGiIWKAjV1EuVWJLMQ00FyjiTBME4GA1UdIwRHMEWAFGdGiIWKAjV1EuVWJLMQ00FyjiTBoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA4UVssJmyB5YwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUpEFWWUSEJxCGluR8/43q96hS/qSB9KQrYGASHb+38GOr7JnZ+ctFkyXm9Z8+v2ICvtkbxRonIwAc38uQz92E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 8d8a01c0..00000000
--- a/swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJMOnU+BgpDoMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMVLWtGqTu6Hq/GT4Qz58PRGEP2l7VN9veA5YgBPy+KqN25RdwozIpSJFe7ek8E/PCAnOpT8agMhMDMzufO9hXsCAwEAAaN/MH0wHQYDVR0OBBYEFMMCJlwwelmtsroasR57Q+16sLU7ME4GA1UdIwRHMEWAFMMCJlwwelmtsroasR57Q+16sLU7oSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkAkw6dT4GCkOgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAn600lC8Qxd/TMyXMe/GgVD1P/WdIss5KV5sZlReOCfKFFrHSrXtrMs9soGwnwbXGXiY28JCsrEcM1cl3kTwRo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAJMOnU+BgpDoMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMVLWtGqTu6Hq/GT4Qz58PRGEP2l7VN9veA5YgBPy+KqN25RdwozIpSJFe7ek8E/PCAnOpT8agMhMDMzufO9hXsCAwEAAaN/MH0wHQYDVR0OBBYEFMMCJlwwelmtsroasR57Q+16sLU7ME4GA1UdIwRHMEWAFMMCJlwwelmtsroasR57Q+16sLU7oSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkAkw6dT4GCkOgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAn600lC8Qxd/TMyXMe/GgVD1P/WdIss5KV5sZlReOCfKFFrHSrXtrMs9soGwnwbXGXiY28JCsrEcM1cl3kTwRo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8452/idp/profile/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/nya-04.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-04.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 962ba540..00000000
--- a/swamid-2.0/nya-04.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-04.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
-MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
-QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
-HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
-fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
-RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
-2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
-HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
-rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
-QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
-zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
-OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
-IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-04.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKnzf9+A7wiPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI0WhcNMjAwOTE0
-MTQ0NzI0WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDRE1oUA3oIqPJd964ZrhbYgSuU3WnIh
-QaH7Me0Cr3PyFZKETJAWoTm5me28S/xCfgebEb2yoU/BC+6Su4cbvxLJx61+pYKf
-HOp5bmNEFhHZ+Im01+yCXQ0+/Er6MUN/y4SpNLo7kg7KlQhIjGvoR6Vb0ySLP04w
-fs3qHuUXLPwMZLlTVwKqUorJ+gV1T4BAiytnLVpXj2+ComfkKDwk9Z10BZHwDuvX
-RU/Pa8sCatx1JKKjtYReZzsgDcKgd11o/e7AM4tQYOcQBbb8m7dy2zySrl/iGAJz
-2quSjcxS7PRYOdgdu2SiOrK53HCysgp84KpsMjeSQn5kfy2ytgUuNwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDQubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT3iSLcrVBHW5d89yksIzgr
-HrlRRjANBgkqhkiG9w0BAQUFAAOCAQEAbg65zMQxHBXIWCmme2DLkBSmlZ9iJIyM
-rJpOD9jk7mnLRx8S0tq85pk1VTF9bDQMqG5spKdHToP2HmuXFbruO1jj9C0Tp61c
-QNnvJwtCwWeiDS/ZGFXBhse89/EyoZoPzn6XL0H1+YP/MHMy12jkcaIfXd4mY6QQ
-zmZQXsRIhXqAdXkC2OFo054vID/8EwcCLhrm2tESYVdQJsH0B8fDlxM/u08qgr5r
-OAQMren3/2/FCgt6Roup3cosI2Vpg7PNZDlaD+he8Ug0JsAZSebcQKA/PcvhNVNt
-IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 25748ecd..00000000
--- a/swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI1WhcNMjAwOTE0MTQ0NzI1WjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMlqP+jxLzO+Ok4m3YHCGSDPq4jLVyT37lEx2YAdqUlBlH3kHGbe6J9bRAFpqOrX7vwAZ3Yn6J4geGfBBgAXXg8CAwEAAaN/MH0wHQYDVR0OBBYEFL+1U1J/K6Yc1USfTSire3LevrfeME4GA1UdIwRHMEWAFL+1U1J/K6Yc1USfTSire3LevrfeoSKkIDAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlggkA/m45dWPJ/xYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGWFjyKnL89EVz7FdMGUtQ8ptysVbxKFTbfSkhp/XXnUEz03kNiEIkwaNIuzumFRfwP5mXlCk7HamMfYkzyol5s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-05.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-05.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index c520d13a..00000000
--- a/swamid-2.0/nya-05.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-05.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALyDIxwjHTT7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDA1WhcNMjExMjEz
-MTQxNDA1WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApsttLbU44IZwfkE1i+lYbh3v902LBKXL
-PmPhQNU2vuSQVFBpInH5DWzuefmAyEPJ/WPOMUa/Xkyrs80mF4AHUuRaH9VLxLcG
-7uQ5ENbzLQ6iQoc77K1yOCD6R6oEu4NlkKo6a2D8ufzdvaivEBFhUPSoJF5bRY/u
-n0l/6mFxo7rJkJmo3kEKTmwu+1VQQ6WGW8nikfIblJpvz5i087RFItqyj+qBgSHt
-t+itdhU8jyM0MUcO4NSDU7MkjAzWYg/7XN16muD/bHXZiO8L8/hbTL3WSRkbD17z
-anzX5UAX602ISUxNINhWHcjdhEvCfaO7hIbHgH0enMD964HzsCReIwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDUubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRYKOZhjQS+oiTecauf
-gzCYmcgvBTANBgkqhkiG9w0BAQUFAAOCAQEADEJiZIy2MKpap1oiRtfe0Paco1vn
-Ib9znt11U3sgT798j6tZcoKRdZyqXzqjCjYIMaATN7x6VJuZBAJGdPvg1Pq/bZ/5
-mIB44zarRLUWcdIQY4PVc7Kb9NLsprf/0NuSlyJAvCobtChO+LsarM5zJNlk+t1m
-5vA7hxkZcFHwTlWpmerjXLg1xqX/D/EuXkfMnd44XXixvaN/1Csflx/DfUdIm1YR
-fBr8xsQYIgJ92okJahZ3f0blo/RHzEB3AGUKOEsauzM8+vMHgAJXHFXNiMqNclLq
-UloWvFxri1sjNtHE89jjeXRj2AEozuiMmMjOImiLXZKsc6KoZ6cBtwXuSg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-05.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-05.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index f6c095af..00000000
--- a/swamid-2.0/nya-05.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-05.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIReNeBJNo61MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI2WhcNMjAwOTE0
-MTQ0NzI2WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3lPw44dhmSAYWtNxxtwuMhhsz2/C+hda
-NoGunH6sV737/wX9533Ym66ID8zxT16WNsQL8K7WTHKCth29MddlgbKwCnnCUMsP
-PPNnW5DG57t0zSL7Szgsz/Ay5HNxv57mEAb5//ZLV+xkLRXgAIizdql5nLUO3uUe
-QrGVd8xN6DCPEwcKkUAwGnFPK/aaEiIqlebj48WW/lAzyQf24MwHpP+zakjXmlN+
-wgh9GS7aSN2G9DqSbUR19qV3rcYZRpHRsXoiYbqhX4TU5rSZY0GknaJFUzZsYYTq
-uLAT+zKjg99LP8s415vKK5K/9o//qey1sSftmC/K+yqEThFDRkvs8wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR0HfXhEae10BzCmr500Nn3
-8YWFMjANBgkqhkiG9w0BAQUFAAOCAQEACg3TqtHJvs8GnYnDp8Z7mQRsnACPJ9nq
-vPJPB/S2Z4lBqEPjiPbdMvhm72+kc57ISRu9EovxNJuAfhp+vlB1Wrvlkd2PNWbj
-/mBWAl7Kau81mfKS6Gsz8whEhDuB+h4W9m4Oo/wROF+mG58drOpGhRB7W83OUL2F
-gM2APTNWe7QD6yfS3Amb8SxVjxx1F3/Z9L5sZ0IC6yUOqN83dZxmy3MaOSdmoPGf
-QZk1HMxJXgH460Iw71JxrXd/1SFpI0LdLaou4/IbEXEeCh0GeNOWp7DCqOTlYFTs
-EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-05.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIReNeBJNo61MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI2WhcNMjAwOTE0
-MTQ0NzI2WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3lPw44dhmSAYWtNxxtwuMhhsz2/C+hda
-NoGunH6sV737/wX9533Ym66ID8zxT16WNsQL8K7WTHKCth29MddlgbKwCnnCUMsP
-PPNnW5DG57t0zSL7Szgsz/Ay5HNxv57mEAb5//ZLV+xkLRXgAIizdql5nLUO3uUe
-QrGVd8xN6DCPEwcKkUAwGnFPK/aaEiIqlebj48WW/lAzyQf24MwHpP+zakjXmlN+
-wgh9GS7aSN2G9DqSbUR19qV3rcYZRpHRsXoiYbqhX4TU5rSZY0GknaJFUzZsYYTq
-uLAT+zKjg99LP8s415vKK5K/9o//qey1sSftmC/K+yqEThFDRkvs8wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR0HfXhEae10BzCmr500Nn3
-8YWFMjANBgkqhkiG9w0BAQUFAAOCAQEACg3TqtHJvs8GnYnDp8Z7mQRsnACPJ9nq
-vPJPB/S2Z4lBqEPjiPbdMvhm72+kc57ISRu9EovxNJuAfhp+vlB1Wrvlkd2PNWbj
-/mBWAl7Kau81mfKS6Gsz8whEhDuB+h4W9m4Oo/wROF+mG58drOpGhRB7W83OUL2F
-gM2APTNWe7QD6yfS3Amb8SxVjxx1F3/Z9L5sZ0IC6yUOqN83dZxmy3MaOSdmoPGf
-QZk1HMxJXgH460Iw71JxrXd/1SFpI0LdLaou4/IbEXEeCh0GeNOWp7DCqOTlYFTs
-EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index eb26a175..00000000
--- a/swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxOY9RhOptKAmh8PJRTltuofdFO9qSV6Lqi8mHghtCC9kbzS+8Fxjk4XDyrLMfsJxLGsE8SVUvjghj3R9l5T4UCAwEAAaN/MH0wHQYDVR0OBBYEFLH6uDmLpZZyqAZ2dw3ifJpqzL5zME4GA1UdIwRHMEWAFLH6uDmLpZZyqAZ2dw3ifJpqzL5zoSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAr9A8jgmBejgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1QBzPIxiV0Qo764A2nz092VCO/55NnFl+TIo3S+DnGPvNkZe0xPhN8Q7IbMJqG+XSaK40pluv44lfyBISAnQY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 52f87c27..00000000
--- a/swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOa7g4siUuR9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOWW5xReFqnxP2vR63roPU9RnedknqIWybI6jAvZuGuM9OzKsOTxcRLu+fvE3Rxklgbk6HS95H1XhAtnpNTrFgUCAwEAAaN/MH0wHQYDVR0OBBYEFJsJjFrGfspuz4Y+4zCoWkRPWmETME4GA1UdIwRHMEWAFJsJjFrGfspuz4Y+4zCoWkRPWmEToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkA5ruDiyJS5H0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/9lH1pxsECfZ21kUsQaHvObS2aNVivsDkPvXMibMgAhqfS26AYbmHm/FoGokfmW15MBTwNHlxv2RFL9LwYKUY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAOa7g4siUuR9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOWW5xReFqnxP2vR63roPU9RnedknqIWybI6jAvZuGuM9OzKsOTxcRLu+fvE3Rxklgbk6HS95H1XhAtnpNTrFgUCAwEAAaN/MH0wHQYDVR0OBBYEFJsJjFrGfspuz4Y+4zCoWkRPWmETME4GA1UdIwRHMEWAFJsJjFrGfspuz4Y+4zCoWkRPWmEToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkA5ruDiyJS5H0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/9lH1pxsECfZ21kUsQaHvObS2aNVivsDkPvXMibMgAhqfS26AYbmHm/FoGokfmW15MBTwNHlxv2RFL9LwYKUY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8452/idp/profile/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/nya-05.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-05.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 17f8cbb7..00000000
--- a/swamid-2.0/nya-05.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-05.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPYOrikgCEZNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI3WhcNMjAwOTE0
-MTQ0NzI3WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr0eRo5HrlJHjxgAY0vangKmidk0FoGcg
-7SJYKs07vNwLUfHt4MzVCan8Kdobtbst6Xf8uNcqGfNL3YC6oWI5XOV//bjqRqnh
-OHiWKYB4wfYN1MgIjKUNJ+t0hNxIr260GybxIiZV9+iziVsHPt55EiaXClhEG9x1
-4oQChcaBcxaBpE0xQnSgJyFvkJkW3nSJXFLMkCGmPIy66JETQ9DPWEZD/qigD08n
-EyPASwuYP1Rm0vfz6zKPKETsJTQj+gDT8bShD0H/QWCAg8qPXeRb2V1uJyKAFfCJ
-6jaZORoddX2fE/v50efTHS7+IKMxCmPGPLeTL1u6YQ8YGEVBMkCbrQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRG5T3LrJ0xZ9TaKQSgPZGC
-VLByOjANBgkqhkiG9w0BAQUFAAOCAQEAn1C71xkeqdvW3avWlYECejReh+Wao7iy
-ji0KtkRcOn+7s1+EOlRlGFte9xU5CgytaehJfVRUjRmIrmBI3PvCmFIA39198U/u
-HlUH+wFzNxiQupAv6I1Ncz/PvA6FFMbengLvrb7umzTdWO/H3a495IaRBFT3Fat+
-yVVLr3nmGwMLM+kkk49KfvqTSM3QsoP9qDCU82S0zZJIiXcB6qLXnEU8EOY1vjn2
-PK4rpcde+hTqL8qtLia3p3AaP9nfwSs5RO/xMYfXao8ZIeMCjGO95X7mYuYNLOSj
-oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-05.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPYOrikgCEZNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI3WhcNMjAwOTE0
-MTQ0NzI3WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr0eRo5HrlJHjxgAY0vangKmidk0FoGcg
-7SJYKs07vNwLUfHt4MzVCan8Kdobtbst6Xf8uNcqGfNL3YC6oWI5XOV//bjqRqnh
-OHiWKYB4wfYN1MgIjKUNJ+t0hNxIr260GybxIiZV9+iziVsHPt55EiaXClhEG9x1
-4oQChcaBcxaBpE0xQnSgJyFvkJkW3nSJXFLMkCGmPIy66JETQ9DPWEZD/qigD08n
-EyPASwuYP1Rm0vfz6zKPKETsJTQj+gDT8bShD0H/QWCAg8qPXeRb2V1uJyKAFfCJ
-6jaZORoddX2fE/v50efTHS7+IKMxCmPGPLeTL1u6YQ8YGEVBMkCbrQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDUubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRG5T3LrJ0xZ9TaKQSgPZGC
-VLByOjANBgkqhkiG9w0BAQUFAAOCAQEAn1C71xkeqdvW3avWlYECejReh+Wao7iy
-ji0KtkRcOn+7s1+EOlRlGFte9xU5CgytaehJfVRUjRmIrmBI3PvCmFIA39198U/u
-HlUH+wFzNxiQupAv6I1Ncz/PvA6FFMbengLvrb7umzTdWO/H3a495IaRBFT3Fat+
-yVVLr3nmGwMLM+kkk49KfvqTSM3QsoP9qDCU82S0zZJIiXcB6qLXnEU8EOY1vjn2
-PK4rpcde+hTqL8qtLia3p3AaP9nfwSs5RO/xMYfXao8ZIeMCjGO95X7mYuYNLOSj
-oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 309251d1..00000000
--- a/swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI4WhcNMjAwOTE0MTQ0NzI4WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGEyRCXe7LxtSdeeVx53JkeY8k4sWiCqhvCZhIxNJE7rxaCgtOD9WTBx2dIzX5xdkhT+zpGNDfcaIc7cdiS9pcCAwEAAaN/MH0wHQYDVR0OBBYEFLYS2FbLapDYxhyCnH/oPlTO1ROTME4GA1UdIwRHMEWAFLYS2FbLapDYxhyCnH/oPlTO1ROToSKkIDAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlggkAyryZJ8gS0z8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALNURWy3j+Fbi5XwMzNKUN0w7yd4ojh4j+oM5M5TkAKL+hU6k+gEVbLbEjAfZ7Qg+ZXoIHErPpuuZYD3f4HZYaA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-06.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-06.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index a3a91c9a..00000000
--- a/swamid-2.0/nya-06.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-06.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAN45t3SCPRIiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDA5WhcNMjExMjEz
-MTQxNDA5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo24qP2amED1PXbQQ3i5NkpRvItQutad3
-6ynuNzka1Ad2R1SwqxkBHzOfsEEOrfcaYSeD9nTUvGZajJosKKphtWL+MWoEPMnQ
-zWhH/EUbB6pKrfVxn1M5NWERxFdSIpL6JHEHUAMm13I7hZvt02jKqTVa+gICoHrI
-5WuXPmoyzNnbdvw8B7mEPCyKE8aORl/FAINetbyy+TtIioyP8aSMJgpoBm5tgOKN
-JSNBZC6SeHTQDiCRdluZu6On+V9y6WS9a+zwuZKtwaZEsjns6SJTrnnfMgnB+eQU
-3uPiXy6Dgi8OMI3nPcPMdQQ7QIrJva7ao5NtNqQJ4p+WPfFOiSJKaQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDYubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT7LsD3jinvBBq0gQ6O
-G3I5c5VHIDANBgkqhkiG9w0BAQUFAAOCAQEALJWcrU9iUx7PzOzK/YBehQGLCtfd
-n/vWMfJdiaQC3yCaBroTm/6yewSr0a2+ekC8Ph3Mhohi5YcZB2hl8Q56D/TszPqJ
-RO8hipB0lDmNUY2/Jz8oOpyulI/5NxZsxxWoNZOr5K0UFlUJGCI47joux3jiQjeM
-OqA8HZN2Ni3dJue9aMdTy13bdpKR/6G2Ytj+HMysnSh9WrTk+vHTCFJi14OP3IuC
-n8H5pFJ9CPQj2RwRs2Lf/i8+c1wXJhDwUJBTE0ypxh22prR5d92WZIemL3nH1Aq1
-8iiAcG5jJSuqu1WpwXp5kW3HnHUjKBDEetZVAlOEtZFJM24FmmlAxj19fA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-06.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-06.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 44cffff7..00000000
--- a/swamid-2.0/nya-06.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-06.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/gTs3dP8wBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI5WhcNMjAwOTE0
-MTQ0NzI5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6x+9mrbiCY2RwW9EXwsJaIxzWZxqahcV
-8laWoZY+K6V+Ufm34cRin6ca8CsCRzdfvS8XukuIPeY/1Zn5alsFDGOCtnPD8rLe
-Ee1XQmoIWMV2mz2Z576jB3AboImMDbFAicqA9zwh4rc56asUX9iR/JgUvgD8c0l/
-/dXAo96oEv/ui5h4P0+xwu4oDqEQtFe3IbuV403aEmqXLzacxDIFwhY3HkMl1TTd
-EjNgq0HjN1Mcv9BMU7LavefOLsSEf3jmtOMHmmZkdXfk9jjXyBqbcdG33Zymxm8n
-23ZLWWtK6HdrNeFpzuAfVLr0d3PoXQrAdu3mCUlHjBq317PoHEQIKwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSljX1Nk5HVZ3ts7U1n29lH
-R+xGiTANBgkqhkiG9w0BAQUFAAOCAQEAODHC7tK9BzD2rP70OCe+Zr5cMoKHvTAH
-0f4fWVy/LbQe43rOlhJtGt9C/Q/LDoPupv7SlH1LJGewgX2cJ+KGVnhFISNydVot
-XzR/9IJPtG9JuJqCG6CEIsVLM+vghs1S6wvXacZOcz8KeMBa18l5mIMdYSNIhqX/
-vjvqobojumadEw61UrpaSmDKTvotgUpuzy59U+4sip74sFf7RaoaxgJuLjQcpf5R
-dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
-6Ie2rVKlj8v7JXVwju3yJ8idFo6BjZ/CVWk7hcdF+jH2sHLcjZkhvA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-06.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/gTs3dP8wBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzI5WhcNMjAwOTE0
-MTQ0NzI5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6x+9mrbiCY2RwW9EXwsJaIxzWZxqahcV
-8laWoZY+K6V+Ufm34cRin6ca8CsCRzdfvS8XukuIPeY/1Zn5alsFDGOCtnPD8rLe
-Ee1XQmoIWMV2mz2Z576jB3AboImMDbFAicqA9zwh4rc56asUX9iR/JgUvgD8c0l/
-/dXAo96oEv/ui5h4P0+xwu4oDqEQtFe3IbuV403aEmqXLzacxDIFwhY3HkMl1TTd
-EjNgq0HjN1Mcv9BMU7LavefOLsSEf3jmtOMHmmZkdXfk9jjXyBqbcdG33Zymxm8n
-23ZLWWtK6HdrNeFpzuAfVLr0d3PoXQrAdu3mCUlHjBq317PoHEQIKwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSljX1Nk5HVZ3ts7U1n29lH
-R+xGiTANBgkqhkiG9w0BAQUFAAOCAQEAODHC7tK9BzD2rP70OCe+Zr5cMoKHvTAH
-0f4fWVy/LbQe43rOlhJtGt9C/Q/LDoPupv7SlH1LJGewgX2cJ+KGVnhFISNydVot
-XzR/9IJPtG9JuJqCG6CEIsVLM+vghs1S6wvXacZOcz8KeMBa18l5mIMdYSNIhqX/
-vjvqobojumadEw61UrpaSmDKTvotgUpuzy59U+4sip74sFf7RaoaxgJuLjQcpf5R
-dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
-6Ie2rVKlj8v7JXVwju3yJ8idFo6BjZ/CVWk7hcdF+jH2sHLcjZkhvA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 82dbbbae..00000000
--- a/swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTWEudaHYjOx6aiIqySnpJ/B1hTFSPARCi0uX3HZqHkXHPfX41WmIcNKRcFyMEQKCGyAuT6ATosJ3vuAZ/uGG8CAwEAAaN/MH0wHQYDVR0OBBYEFApc7vyjkK+1w1wUasFLAiAnVZGeME4GA1UdIwRHMEWAFApc7vyjkK+1w1wUasFLAiAnVZGeoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAzzr88K24tccwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFmiqm8ZuFS4moNp2XojDPC9v8KAJoelkM4BAyLTXxUMo+l9rffwoiX4bRhIltjJd2JfEEbLkP8Jtl2MIHUsuFE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index bee57c00..00000000
--- a/swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN+tyFDHCyK8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANc8/SRUH9QgNWfsjvm083N7oBRvipxUfU49NOwgZNh/ZhbQbXUedmJokgel1IJNf9BMf8XdYqCKHVkRK/FCK8MCAwEAAaN/MH0wHQYDVR0OBBYEFLD1zYxFkym08Q1Z9vgHt9MEgDVQME4GA1UdIwRHMEWAFLD1zYxFkym08Q1Z9vgHt9MEgDVQoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkA363IUMcLIrwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACEe3VliikmvVwcMwOKyQrPBzOuEZPz0paYjWrIIFd+CRVcveKGpqenBBU6frHPcEpdyUsSt2os/hG2xOdkwnc0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAN+tyFDHCyK8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANc8/SRUH9QgNWfsjvm083N7oBRvipxUfU49NOwgZNh/ZhbQbXUedmJokgel1IJNf9BMf8XdYqCKHVkRK/FCK8MCAwEAAaN/MH0wHQYDVR0OBBYEFLD1zYxFkym08Q1Z9vgHt9MEgDVQME4GA1UdIwRHMEWAFLD1zYxFkym08Q1Z9vgHt9MEgDVQoSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkA363IUMcLIrwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACEe3VliikmvVwcMwOKyQrPBzOuEZPz0paYjWrIIFd+CRVcveKGpqenBBU6frHPcEpdyUsSt2os/hG2xOdkwnc0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8452/idp/profile/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/nya-06.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-06.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 286c4e04..00000000
--- a/swamid-2.0/nya-06.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-06.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
-MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
-UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
-TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
-54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
-8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
-NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
-2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
-67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
-NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
-O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
-08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
-vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-06.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJU9ZyGFpaf1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMwWhcNMjAwOTE0
-MTQ0NzMwWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3y6ms5BR7ANajUZ48upzTAGNtLFnGQWn
-UJjh3+rWC4YR6poRJdPqy2D/X6Qk5U6XllkzQK6/87QNcvWNQYuHFsohsqdQbDqN
-TRQFcUY/GrZrsWi1BqK4Kur9X1blE00bgfF3g1Q4ckSPnYJrsRLjhuEwNDGxMd4D
-54DVY8oyq1p0XBJCdzV98HxgT50RWSZtU8mZsFeqMXupG3pdYsARPsT8KJyWuruz
-8VBP3OUJ2zpEI1HGcbPmw7mrXSEpS5AGCYxCmoOtWH8ivtpPkRYejytYdyli1ODR
-NTsWoeLPYiEtCrTEx+csmwB9yMZTcQDkS8AyL78xGft0oCFT0PZGuQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDYubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS69I6J1WnLhxDpTA2xOuaF
-2P/YnTANBgkqhkiG9w0BAQUFAAOCAQEAQiVF/VQOsIDzj1dU50AU4tdt/BW970Is
-67hrpK57WkAVfQrNfu1h0M4dElif9ue1ijk/Z8zE2JKdlh+qVTkfgCVSWiJspOUw
-NvCE9XEqxXQRGE7IBuRjSRKcFNxQ5uf6Ye0By5IW6C9ey9j4+fsY022uKAo41p5/
-O2EgL84jp7AH+leW6OqVNnnbbIT7bGbEJBJtJgK003fyc5Vs1qYkpW2PSHVsKtf1
-08osMW3Nz1X59nMhxwevKIUQ2ScCaGG12ddFQAtB3DNAhUG5j1/xx7ZdczYZyu7Y
-vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index da47100e..00000000
--- a/swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMxWhcNMjAwOTE0MTQ0NzMxWjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK7ML5n4wuUCbVyDXdNZlZrbOIsmNjEGkM5MNEP1jw+G0n54aWqzVYN6HkrkdnopNSFGoWEH06bzcdQ+nOCO9ccCAwEAAaN/MH0wHQYDVR0OBBYEFIOBFdC9LMZux4Plcm1ohjXMiPG6ME4GA1UdIwRHMEWAFIOBFdC9LMZux4Plcm1ohjXMiPG6oSKkIDAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlggkAt00qrC7x50cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFWo72ct6PzPcfNiIl/nSbP5MDhq2a/fm2HqT7PJMkKHSOCZLbxkOHGQjRn64BA+1X3UJnJAg99yX1pMGiC1nL0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-07.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-07.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index ec7d612b..00000000
--- a/swamid-2.0/nya-07.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-07.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOsHSvIeKBPNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDEyWhcNMjExMjEz
-MTQxNDEyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0wXxwE1N89lMzChcIvd120DeUXk8pXkc
-GO3kTR5nYaOZaG5T283P6uXn30cqmNBaOalrhbDt5lWPZOU9uLH1QS7R8RHUZhR3
-4JvAkM9D+IF/Sl2xemPvhlowl/EDLrYd7sD1bkh226F0Kq8qh2KX0SmMOGNgByzS
-5jWbkmt3A8B6bUNt9q1vuPCG6WYNbu/d1h5Gyqg7MY1xjGCAYYUgf69AlLNohgs8
-d6J5aO9Oo2ArxU2TdP+aJc3RoWwHdUbRXth/DxNpZFIRKtawkaz2icKpC8HOHc9g
-dvYH0Wt4lLHi1g+iCcyAju6GRV44Yzl6rIImeUsgUhRDr6PGUxy/YQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDcubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT4jE6x1AfPrVgy/eo1
-Te51ctgOvTANBgkqhkiG9w0BAQUFAAOCAQEAetCGuV7AVlZjspl8BEq8UBaV0Nxg
-Bj8JoYZhXd9Q12BHWMJ9KivMcD/GKvevHRNnQ10UBSx/DjXGvlM+PohOPhOCHwuT
-R3PEpFljl3+N6MnsyherTGYRNRMSr8voNRP4HlDj7oCcDUaqLtXNeDzClTOGcy8t
-GoXvFV5stm2UIboKwakq4WyyYTrKt26dniCXPnSw4EIisybzohTDRh8e0MioDOAN
-GQCEMYSG6ycLQ0LsSsNovS8tER3oMbuOt43AujZxkPQsGUXIkHNIoCfD2DuIcc4w
-4BJFE4QduYnG5AYwEaE0Y17R6J2K8TBSpqSijqRI7ggjP8dMHd3JQrcbbA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-07.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-07.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 79032739..00000000
--- a/swamid-2.0/nya-07.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-07.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMBbpJvMFWysMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMyWhcNMjAwOTE0
-MTQ0NzMyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA02uMlRcS6ZmG3e8sBUxN0JS4jxGd9XgB
-Gv5rEoy8zwJ8x/FjMqmKoebTNhr5+l+pnvT3eIrRCfvgJpvu5tfO62GnClK3Fijo
-Xbnxu3q+IP97D+A6VnNcaemcsSHQrSS0xUHlczRTO3pqy0ss6xoLjLcsH6Fz1wTJ
-0SaN5ipmwAr9NekKkwacbnCaHcE7bMN5+GGIe12M1kWkWEsx4wb5i5gjxcqJdAM3
-J1st0vbAxc5U0jeDLG7R6tDdZztkXyCVjIHoh0i68tFypBQQ8y+BTe5RNL+iOL86
-zpGjd3oO+QCvgz5jPB+ZeQSZUlSzmYa2VTJFmIn4yKzUB/le3v8I8QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRnPf6btAEHWpUCiH4MCgXt
-txw1wzANBgkqhkiG9w0BAQUFAAOCAQEAckT4x/jfu2n58E6Lqnh5BEtVTc+Cd6Fv
-yLIxQBhZjczigt5mEH2OnA+1RpllchMrhdW6ymlNYimaB4VdNhM3uMfiv5BPs7X6
-8hyTo9f7/PXUDaZHzZKQn14NFNtXE/MpliV7jpGNvyVCx+T8B3W+ol9sOgSvd5E8
-IwvPC2CsDwbvQ8+tvTTVHgT4jiOixGzoN1uMyx5kKDjbymkUa7LZa84wCJNyeJcB
-JfbEFjH5PIOZUxKzbdtaGUguUNQWOmGKy8Y7nH7mNKF8Nc/IaKqCjfnoSJSt+r/p
-OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-07.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMBbpJvMFWysMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMyWhcNMjAwOTE0
-MTQ0NzMyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA02uMlRcS6ZmG3e8sBUxN0JS4jxGd9XgB
-Gv5rEoy8zwJ8x/FjMqmKoebTNhr5+l+pnvT3eIrRCfvgJpvu5tfO62GnClK3Fijo
-Xbnxu3q+IP97D+A6VnNcaemcsSHQrSS0xUHlczRTO3pqy0ss6xoLjLcsH6Fz1wTJ
-0SaN5ipmwAr9NekKkwacbnCaHcE7bMN5+GGIe12M1kWkWEsx4wb5i5gjxcqJdAM3
-J1st0vbAxc5U0jeDLG7R6tDdZztkXyCVjIHoh0i68tFypBQQ8y+BTe5RNL+iOL86
-zpGjd3oO+QCvgz5jPB+ZeQSZUlSzmYa2VTJFmIn4yKzUB/le3v8I8QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRnPf6btAEHWpUCiH4MCgXt
-txw1wzANBgkqhkiG9w0BAQUFAAOCAQEAckT4x/jfu2n58E6Lqnh5BEtVTc+Cd6Fv
-yLIxQBhZjczigt5mEH2OnA+1RpllchMrhdW6ymlNYimaB4VdNhM3uMfiv5BPs7X6
-8hyTo9f7/PXUDaZHzZKQn14NFNtXE/MpliV7jpGNvyVCx+T8B3W+ol9sOgSvd5E8
-IwvPC2CsDwbvQ8+tvTTVHgT4jiOixGzoN1uMyx5kKDjbymkUa7LZa84wCJNyeJcB
-JfbEFjH5PIOZUxKzbdtaGUguUNQWOmGKy8Y7nH7mNKF8Nc/IaKqCjfnoSJSt+r/p
-OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 3deb4d8d..00000000
--- a/swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCcoUoOdrHdKdW+tZ1UqK2ahCgJb+abKGcx4cHh20xK5T2GRrAxK0B/UX9vG3N+kkDIk29Pw2mqlEF4H7I6RHMCAwEAAaN/MH0wHQYDVR0OBBYEFIOjSPn9D/WPtxYexL/kojfO/GenME4GA1UdIwRHMEWAFIOjSPn9D/WPtxYexL/kojfO/GenoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhzJSnvWcUiEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI3iwcXljq4fHKdHU/zItzMRFwZJA+axXOAGU8QH6LqHTHFyorVfs8o2gvgH2RNaodxr72HYK4lLHKMhphf3Umk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index b687d390..00000000
--- a/swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALKoroo0+vTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKYKort7X6AG/kdaHOuUfU4CVrq6ZMFf3YMT2e9YvGtW1Sw9e6gTlocxwNEc3suDg+b6QYLzJ4K11Zf08vHcEAMCAwEAAaN/MH0wHQYDVR0OBBYEFOByMDCI/N+2efAnH/fF9sI+Nr0lME4GA1UdIwRHMEWAFOByMDCI/N+2efAnH/fF9sI+Nr0loSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAsqiuijT69NswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHgf7NnD3ypfvKHBkh8mED1ft9DkS+Yfs9ViJpnRjePcJLmfhXPd/jveJS13Lf9K0zz1NEuX4QMPgzDWCo1kCgg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJALKoroo0+vTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKYKort7X6AG/kdaHOuUfU4CVrq6ZMFf3YMT2e9YvGtW1Sw9e6gTlocxwNEc3suDg+b6QYLzJ4K11Zf08vHcEAMCAwEAAaN/MH0wHQYDVR0OBBYEFOByMDCI/N+2efAnH/fF9sI+Nr0lME4GA1UdIwRHMEWAFOByMDCI/N+2efAnH/fF9sI+Nr0loSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAsqiuijT69NswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHgf7NnD3ypfvKHBkh8mED1ft9DkS+Yfs9ViJpnRjePcJLmfhXPd/jveJS13Lf9K0zz1NEuX4QMPgzDWCo1kCgg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8452/idp/profile/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/nya-07.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-07.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 7a1cee32..00000000
--- a/swamid-2.0/nya-07.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-07.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
-MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
-bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
-5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
-hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
-EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
-o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
-/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
-48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
-fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
-CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
-wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
-OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-07.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIBTGPss5w3HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzMzWhcNMjAwOTE0
-MTQ0NzMzWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOLxq8SkZ8b8YdyGfwPjV0OB6QyocICe
-bvxHU5HEr1VTKEsgehrS4ugDc1yCfHS68ut5KOaJKjA6aIyilBq0nOSAX5Z68agy
-5yBR+v4RTjIVhgi2MbRp5CoJxISA9h3GLS+0gMLi656wNeDg1mQRJt8fjy8R2jUD
-hC5eIHoRbfx5LezoxDu7KcOt20nJGx3rdRKrREYDYJ4rWVb/F8LxkU5JgzAF0Kkq
-EkE2ZNJMmeSLolK6TVfKvL7kiZGgbSIUapvg1Lcx+KHHfaod6WuI1g/GnaUmHSIb
-o6pPwVQ293IxMbn5EY9a2ALmYtJIiE9QqK0173wWdur9jw8KTZfWzQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDcubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRnl3x6WJMUOAnWqrPqr7CE
-/8QEwTANBgkqhkiG9w0BAQUFAAOCAQEAEkoE3brtHxrF29V4NRUDHf130+XIDlXA
-48nvD1IgPuzaILoX/5m/5xgF+HRPd356ecwu3tvs7yI2EExXDFCZc7SxmyhnPkrJ
-fxjC0NdVK9TsmfvFlOp3Jz/WOmvvNdL4nSK25eA+9XYDEB6p6dQUF5WJhNHKczWE
-CJvwCutzSJd9h+onoILD24yGJNnEE0enX/vMQHVI848ywdcdn0L2Y+rXRreianaW
-wkKQxPioaOS4e4xZrju9nEIW7Yownjhe/0UachrFLZ6XnCgQLTSiSJn9sypkO9VK
-OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index c0d1d0ab..00000000
--- a/swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM0WhcNMjAwOTE0MTQ0NzM0WjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfODjASFQyedFk0WckC3mIe/o3N64DVGoOsfNIq3Z6bQmeXEsRjXnqBTKx8IRSVkAQqSdg838yxgFYdKueY/NcCAwEAAaN/MH0wHQYDVR0OBBYEFJnzCVgU7nEA2kRDH2408U6yjDSjME4GA1UdIwRHMEWAFJnzCVgU7nEA2kRDH2408U6yjDSjoSKkIDAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlggkAhPKAS7WWPCAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGFV7fNNoN3DzuW2DyH6CyMmccBc1PMftqFc5OU3kMhvyBjbtyNamSQZKRc+57JaOIBQKZhK1x39yqYg+ui6WIA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-08.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-08.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index ac145e33..00000000
--- a/swamid-2.0/nya-08.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-08.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMSqH+D44ITHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDE2WhcNMjExMjEz
-MTQxNDE2WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1WQ/M1g7SAC+TI9CW+ttb1XY/LCtxaBB
-kS2eHcQcqhjjhHzCeSa4T+rHHqdk5fCZAR3q78y2V4wzY3Asd2AUNraAfR+ie0aA
-I9Wpc5RAt2Lt5MDGODOaV67IZfVPOCf4TnGfiOinalj/OHaLEYQPETNqltYrT8ol
-h0hd3idXkpFYhZpvNFwk1a+FS+NNjd/bujFlZFYBrsQGW2BrDEYPlvakS2PJ+p34
-NCHNugcJOJDe5FvwiqMqaEL0jYjp3B4lDfHeE2q6XU1d3acmxR99UBUwWigsV/GI
-PxWU0GdJ1wp9SyuX8uqFn8a5QPC8egdaayiinamjXCZh1YZn7AZg5wIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDgubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTAaSUUwMEwvtfnKTdV
-HzmFV5VuiDANBgkqhkiG9w0BAQUFAAOCAQEALTyINT7P9fuAnfEmXqfwUZusEl75
-5IuYYR+sn1lUCsR5r/jTqfeoasIY+/x2ADfukeP09xC4AiLOeKdwxZs6OKnPUkIS
-9oFmTtRaSVCWBnXPyERd48OZG2nihXZ9XW5PyFEMXcLV6DCiazShKRM3V3vE+DAE
-gjfoMCyZVNApKsiQ683e5esS5vMjZZFmuQU13O3OZbs+n3GA/aL8yYCngQrbPl0g
-fhxD3r8nftNluA0GOvfMWlUZjso9/6o9KpP5/Tc2Da+aE/ImbzwWFplRbTxYQqFw
-g5ahctVSR4PAiGMOtvqARpwdBj7fM3+Utym6dIClautnzeFrcyZRW8YMRg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-08.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-08.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 529a49d0..00000000
--- a/swamid-2.0/nya-08.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-08.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOFAFriMiS0qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM1WhcNMjAwOTE0
-MTQ0NzM1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2B8p2uzEoAoJrII3VKQUfOQRqGKDVlLM
-sEL+1K6eVudV1jXIcSdOzeZGixr+yzNmgR+5ABtZNz26oaox2WEAOviw3Bo7p9N7
-RHP02lslKfs+zi8IlhVM5fvEC7S/IxcViZGkcbgK5387co4TfPJoIWBOUOp4HNMW
-/CKsx84FPd4Hz4R7EeT70YdBAwB3nBZ4Ia7ImGq6OxxUAK5KFa+7Jx2F2YnuKMHW
-hzx6cE5cevuMBbjG8v2An7gpbQgTa4pHK683yEBF/vLP3lRkWdEVVRe3GQzGGR/G
-ovRoFXt6aCbxK5uFykvBSE698Ku6c7gRE3ivbyTnDNANwBJ1qvPPwwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR3nEpFrQRGejZj2h2Jms3a
-+L5t2DANBgkqhkiG9w0BAQUFAAOCAQEAlU5RK7F91Qm7hNWPc8GVzg5VODc9JvgA
-c43VCyJ4xDWqiWu/ewuTi+eoPRD9B/a3IUrCJnqNEJbAJrDgnEv5D4MeJfrQ1g5w
-qT9vCN5E7/kx8o5gKSD6oLqJ7Ev9vnn1YPjvya/51iqgPtPm3UIAnO1Rm5Xa3bDk
-KsvRIztNRobqzEKKth2ezfYxoY7AJe8aT2A0Cw+TVrnQKqUxRth3Q8kBKocH4jd7
-2gNkBfvx9gk9214iuJcs10Hs+Nw8llwiOUYCDi6Xp4HiixeFrpPblSjpy0UCTvZ2
-iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-08.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOFAFriMiS0qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM1WhcNMjAwOTE0
-MTQ0NzM1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2B8p2uzEoAoJrII3VKQUfOQRqGKDVlLM
-sEL+1K6eVudV1jXIcSdOzeZGixr+yzNmgR+5ABtZNz26oaox2WEAOviw3Bo7p9N7
-RHP02lslKfs+zi8IlhVM5fvEC7S/IxcViZGkcbgK5387co4TfPJoIWBOUOp4HNMW
-/CKsx84FPd4Hz4R7EeT70YdBAwB3nBZ4Ia7ImGq6OxxUAK5KFa+7Jx2F2YnuKMHW
-hzx6cE5cevuMBbjG8v2An7gpbQgTa4pHK683yEBF/vLP3lRkWdEVVRe3GQzGGR/G
-ovRoFXt6aCbxK5uFykvBSE698Ku6c7gRE3ivbyTnDNANwBJ1qvPPwwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR3nEpFrQRGejZj2h2Jms3a
-+L5t2DANBgkqhkiG9w0BAQUFAAOCAQEAlU5RK7F91Qm7hNWPc8GVzg5VODc9JvgA
-c43VCyJ4xDWqiWu/ewuTi+eoPRD9B/a3IUrCJnqNEJbAJrDgnEv5D4MeJfrQ1g5w
-qT9vCN5E7/kx8o5gKSD6oLqJ7Ev9vnn1YPjvya/51iqgPtPm3UIAnO1Rm5Xa3bDk
-KsvRIztNRobqzEKKth2ezfYxoY7AJe8aT2A0Cw+TVrnQKqUxRth3Q8kBKocH4jd7
-2gNkBfvx9gk9214iuJcs10Hs+Nw8llwiOUYCDi6Xp4HiixeFrpPblSjpy0UCTvZ2
-iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index c4b32aac..00000000
--- a/swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE0NTM4WhcNMjAwODE2MTE0NTM4WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALKc8qXfkU9C44JlzfJp2kcQB8AjKfqwHTu2mOGAi/RvZwgPZCBlogvFCaSmbVo5FiGBYZTM8THxxyNcyAwAK/ECAwEAAaN/MH0wHQYDVR0OBBYEFOyaaMUFuqQmiPfzuIv4KDDPPQ3kME4GA1UdIwRHMEWAFOyaaMUFuqQmiPfzuIv4KDDPPQ3koSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAh5/14EARPYswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIzGV+sl/ITXxznKsLveUbu93ww/zUuPgOTmQ9q2OUIuh/gCoyrFC+t7e0nX54+xEU06ePZ4Ggu1/C/7ljwpxs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 67c90b03..00000000
--- a/swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKz/NholBowZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHYWHFHdyFzDSROrhUx225Cg+DFpTpBgJDd+xBMyTJyg2C2YIeD3UjCh+di2bO5o9aJykYNtTHPWGMaAnkkgSkCAwEAAaN/MH0wHQYDVR0OBBYEFEv6G3QhkabIy/bOesVPEEo4FOLAME4GA1UdIwRHMEWAFEv6G3QhkabIy/bOesVPEEo4FOLAoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkArP82GiUGjBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADQlbhQBwK1JEMJs6JPNK2ONVYkGamZpEDMI3McPvFxt9UeLrqZZrixmTG2wZFljFie06DUpnGnzthuiEWD1ueA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAKz/NholBowZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHYWHFHdyFzDSROrhUx225Cg+DFpTpBgJDd+xBMyTJyg2C2YIeD3UjCh+di2bO5o9aJykYNtTHPWGMaAnkkgSkCAwEAAaN/MH0wHQYDVR0OBBYEFEv6G3QhkabIy/bOesVPEEo4FOLAME4GA1UdIwRHMEWAFEv6G3QhkabIy/bOesVPEEo4FOLAoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkArP82GiUGjBkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADQlbhQBwK1JEMJs6JPNK2ONVYkGamZpEDMI3McPvFxt9UeLrqZZrixmTG2wZFljFie06DUpnGnzthuiEWD1ueA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8452/idp/profile/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/nya-08.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-08.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 27e15db9..00000000
--- a/swamid-2.0/nya-08.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-08.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKY6wQXl/OYdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE1MjUxWhcNMjAwODE2
-MTE1MjUxWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOKXz8CyzuOeG3QWk7OHEuXvv6aSv555
-5NqUJpvr55pqHbwaoxcGimEaJhIt8KI8ZfIuQ+doY8cSfYcm6YVJqVp85uG0fE6S
-BC3jSQunEZcziVB+vAX5G4eguLPuW/x2wFlHwzRAT6tRvoezmW4+hJrnOZgAFScJ
-LOHdmFYiMXXPF2f3k1GQtgzj1F/bE1CVyJGunihONwPXOXNODrsmlFqLV7IXK9RB
-LMFgN2ypxRFkB7mXl/7EESMV6l9ISxDQlPrC4Plbbp4Qxf3ob65Y3R/c8o/5TuNx
-ZLm6jUaxQZITiPGpFeXkhFf+xa+imJobvsSuOmO43K7QtoxLDOBXWQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS66LMAll0wKzUBqKSP+CbH
-2lD4EjANBgkqhkiG9w0BAQUFAAOCAQEAAuSg1kVvHbowjjfvEbI6R0eT6x1bkeja
-TseD2XjH53ZMNP5u5JSqqaYQILEYlMXmb4ALIup+TU/zYGoPP+IisR6ggKDmeMp0
-1HYV1jXr822BcV6eASILlDuqHEN63tqaSbyjbhSQxUBimU+GqhGA1HJO+PdCd7uf
-Zom+8+Pf3B+LgdhUiJ7VB+ttIlCg7Z+k3oCBdOgW1b6E57A6IlvetbF9PraCtsCG
-h8vkUuVg5GOCJbvf4gADKXl2aLwSR40Roo4qlVHkhNT7J4BVPiY5CunZzC06fAE8
-LBzTjleTsC/pW9Q2h6AMt2Nc+k+LhT74yBBqLusMMmirA6l96Ajn7g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-08.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKY6wQXl/OYdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE1MjUxWhcNMjAwODE2
-MTE1MjUxWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOKXz8CyzuOeG3QWk7OHEuXvv6aSv555
-5NqUJpvr55pqHbwaoxcGimEaJhIt8KI8ZfIuQ+doY8cSfYcm6YVJqVp85uG0fE6S
-BC3jSQunEZcziVB+vAX5G4eguLPuW/x2wFlHwzRAT6tRvoezmW4+hJrnOZgAFScJ
-LOHdmFYiMXXPF2f3k1GQtgzj1F/bE1CVyJGunihONwPXOXNODrsmlFqLV7IXK9RB
-LMFgN2ypxRFkB7mXl/7EESMV6l9ISxDQlPrC4Plbbp4Qxf3ob65Y3R/c8o/5TuNx
-ZLm6jUaxQZITiPGpFeXkhFf+xa+imJobvsSuOmO43K7QtoxLDOBXWQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS66LMAll0wKzUBqKSP+CbH
-2lD4EjANBgkqhkiG9w0BAQUFAAOCAQEAAuSg1kVvHbowjjfvEbI6R0eT6x1bkeja
-TseD2XjH53ZMNP5u5JSqqaYQILEYlMXmb4ALIup+TU/zYGoPP+IisR6ggKDmeMp0
-1HYV1jXr822BcV6eASILlDuqHEN63tqaSbyjbhSQxUBimU+GqhGA1HJO+PdCd7uf
-Zom+8+Pf3B+LgdhUiJ7VB+ttIlCg7Z+k3oCBdOgW1b6E57A6IlvetbF9PraCtsCG
-h8vkUuVg5GOCJbvf4gADKXl2aLwSR40Roo4qlVHkhNT7J4BVPiY5CunZzC06fAE8
-LBzTjleTsC/pW9Q2h6AMt2Nc+k+LhT74yBBqLusMMmirA6l96Ajn7g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 555c34b0..00000000
--- a/swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ4Wlqm4ZWTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAxMTI5MTMzNzI1WhcNMjAxMTI2MTMzNzI1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANpz8+aOuWkpC6JLSnTpEV+dh9k40L74dNa8tqXlGh6xEYn+4XPKG70ScyjGZX+zUYfFQ81NgAI1LhLASFZJVUMCAwEAAaN/MH0wHQYDVR0OBBYEFPJrDTs9uaP5VQVa2VvwDubGH5KNME4GA1UdIwRHMEWAFPJrDTs9uaP5VQVa2VvwDubGH5KNoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAnhaWqbhlZNswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMbK+lB5gbxDntJMaqj3aPOe9YcBbfXGwluOMd1BziOXMj0Jb/nUBrzCIkRfKRqut26uRehXMNPH4V7fybpg2Io=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ4Wlqm4ZWTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAxMTI5MTMzNzI1WhcNMjAxMTI2MTMzNzI1WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANpz8+aOuWkpC6JLSnTpEV+dh9k40L74dNa8tqXlGh6xEYn+4XPKG70ScyjGZX+zUYfFQ81NgAI1LhLASFZJVUMCAwEAAaN/MH0wHQYDVR0OBBYEFPJrDTs9uaP5VQVa2VvwDubGH5KNME4GA1UdIwRHMEWAFPJrDTs9uaP5VQVa2VvwDubGH5KNoSKkIDAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlggkAnhaWqbhlZNswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMbK+lB5gbxDntJMaqj3aPOe9YcBbfXGwluOMd1BziOXMj0Jb/nUBrzCIkRfKRqut26uRehXMNPH4V7fybpg2Io=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 7a8d5bcc..00000000
--- a/swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-09.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMDWEx2nCo+IMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDE5WhcNMjExMjEz
-MTQxNDE5WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwRpIsMkkCFMEtqcsg9PT16AURNboCqXC
-01b1OKSauQXt93tn2VsoQhVoCJefLiYRRw4X0L3ZKdAEFq31LpzIiIdmIJlae4BO
-AVul3c0qjh2Y875u4lDuo9u/NGiED1wfOBwfYNIUaUBfsTA+YrDIbbuYeXxeStMl
-fvL8idQZ3GbAbMR/SB1mDyeB+YijRsBBeQzuj4AF9Hg2NjP+H8grwsvPoMlM40P8
-/Il8oT+NqVmHxU2Wmg1MkqlgKI4FrfSkj6i78LaIgOihHBu0h83R7wx2CM0mcNWM
-Y/7td7Fzyr19SrSn7b5Rh/3A14NIJ5XEJu/eZEXVpfdPC3vodeQWjwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMDkubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQK9PQjxmWtOvJ+n8Q3
-Ou0Xs6GfMjANBgkqhkiG9w0BAQUFAAOCAQEAewQqdvOeIgA+SwJ6I/sLHUVh5Iab
-ZpzxpG0CsKn07GaiKVTHViMZdS1hTVXel9CBM+eRUqUBbR8FQVDb8tFW7gbEYayT
-neTl2PxbiIsjlJyZAIGloFhNf0y3TK0Hvuc0eqVDcLybmy9GOM85GZwwv+VuuRUT
-0dABrNWQyfq316vvDWNYYHF0/i331l27XkbV0WXqu2ffUx8lbaSTMhETR/eNvXl7
-VGHDJhfkfJ6xPJrFVTM4plJ4tZ00DzyRMKUSDkV5so7EB9ZgA889dAQHViyLvXrx
-2+Yu8CQ/GR5np56Ce/neI8MZfpx0h8pD8vWvC0Zx286MzsKMAaMSc8mIoA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index fa86dcd0..00000000
--- a/swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-09.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
-MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
-I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
-SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
-I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
-rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
-qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
-9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
-atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
-qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
-MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
-p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
-O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-09.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
-MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
-I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
-SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
-I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
-rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
-qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
-9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
-atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
-qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
-MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
-p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
-O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index be72edeb..00000000
--- a/swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyeobJgtUw/Ydp9veZByOg4ZK1i1R9pTlAIAHrvGiX4xbT/RRQAwRPCrSuAI7p0HhB8WH39xr30ne8I5BeE1g0CAwEAAaN/MH0wHQYDVR0OBBYEFHs916kVJFdYmvjPSYNhT4yeJLFSME4GA1UdIwRHMEWAFHs916kVJFdYmvjPSYNhT4yeJLFSoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA+PMb2FLJUi0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGe4400mueYal/CoG2wDCH3qU0KafrtwcIH8T9IxdPTfbF+WGYVh5awl3pd3bXbwvLCQU13sD3AaqU7ufHWJ90U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 6b421763..00000000
--- a/swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALAOdDKUibLPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOMPaKw43Otk+1YULkGDTMssbof6RI5F2ki9c3uJV0VSmVN6oxGM42nA0EZXZsr3a7WNW2uM6KFCS54+m8L6ShkCAwEAAaN/MH0wHQYDVR0OBBYEFMhEwtYmHacMQ1/sNmZcq72tPa/eME4GA1UdIwRHMEWAFMhEwtYmHacMQ1/sNmZcq72tPa/eoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkAsA50MpSJss8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJT3NIwSYF1zUxrdv4OijD6U3ZG1M93Jw3F9TTRJcLGxH0nLZmnoDP/TTfV3ZmCLEr/O9kWgLNSVmsiw99ughd8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJALAOdDKUibLPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOMPaKw43Otk+1YULkGDTMssbof6RI5F2ki9c3uJV0VSmVN6oxGM42nA0EZXZsr3a7WNW2uM6KFCS54+m8L6ShkCAwEAAaN/MH0wHQYDVR0OBBYEFMhEwtYmHacMQ1/sNmZcq72tPa/eME4GA1UdIwRHMEWAFMhEwtYmHacMQ1/sNmZcq72tPa/eoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkAsA50MpSJss8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJT3NIwSYF1zUxrdv4OijD6U3ZG1M93Jw3F9TTRJcLGxH0nLZmnoDP/TTfV3ZmCLEr/O9kWgLNSVmsiw99ughd8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8452/idp/profile/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/nya-09.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-09.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 0651a2fa..00000000
--- a/swamid-2.0/nya-09.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-09.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
-MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
-1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
-xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
-scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
-KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
-vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
-5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
-5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
-eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
-ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
-Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
-ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-09.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPbKYUWz91aaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM3WhcNMjAwOTE0
-MTQ0NzM3WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugmpodAJ9MNQukBYVU0zrFs4diDQWqeI
-1m/lhKiTlbyrJ1HJO797IKj+dCMaLxPm46k/0Hw/xK2nJTfc30zT/Fo/arfrWaZP
-xoF3w1d4QmnYzubrMBr4Nc5WY9ymcVShQ1KMo9XvsACDJcwXMYMidgBAxwmz9u3f
-scVQRhenQkmDWyypT6MOf5LcikpDnS+eMUnyx1WimmtgN5i+aA2EViEb2ZOzfbVr
-KJcUjbZG/774vISYwhlR3SErLDIZklBLAID86iZo0cnuA4FXAMNJ8drPT/B0PoM4
-vktPubB6JAeNq5SPFTxDJBc+SBzP433X8V+HSvv5L+npnZ0Pq1QndQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRldgQJWoBWWFtXKeHQwvQE
-5v6wazANBgkqhkiG9w0BAQUFAAOCAQEAjSL/c0MY1vwaHA7gxYmyxMo+jyw2QC59
-5fIFXnZSfaDo2GDTC4WfPB6gFM5DrciiMbWfRQ89EJ7XIdp3t1HMo3i3eaj3SW+B
-eEX6MMEAZAIfSwMZYAIaH45krAnTjlR4V/TiLK0OhVHQ3AWYJewa8xRasDjiTKlt
-ORItfkHMjvt033n8jJQ0QFWWGiE08Mw+rlDBipVU1TrxefY/1rDJZIQNJ2qnPwze
-Xs9OHWfzbCnXss96yH20LjI/rrRVRtpfgTjgXxiQKnjwTtmxcSqbZoU7hmfBcIEv
-ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 542e5188..00000000
--- a/swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM4WhcNMjAwOTE0MTQ0NzM4WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ90nGkp8/k014breRhiE0Je6k++YjviW17tnj6/TznPecLYuy2Njx1QYzmQC6UZh9dmoyDqD6RzsaKsWFVNqkCAwEAAaN/MH0wHQYDVR0OBBYEFBAh8rV7ji2BdIvxoKf+zgshRDTpME4GA1UdIwRHMEWAFBAh8rV7ji2BdIvxoKf+zgshRDTpoSKkIDAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlggkA90OYM72yGmkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFSfKTeq2U5ccFwE5Pv20kn6psP9CM3Pubddso7DVox38b+JCXqdIJn1rwLR0hBO21Z3qlHTHD31tKsyrDt/XkE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-10.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-10.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index e940ca6b..00000000
--- a/swamid-2.0/nya-10.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-10.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPQ4VZK3spIpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDIyWhcNMjExMjEz
-MTQxNDIyWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Y+QaGQ42e6AR60SPpuJU7YFJmT5zc+9
-djSG7CSJIRJl47uxuASvps0x3eq0GS3ytEd3+5VaASZCtKnHs0cuiGq3DMPt2ZrS
-mfUmV9F6y3rm0zoY7RJxYcRP260jlsuaXQmMBkxGR684XWkfW8eg3fop9wzJZk5k
-PJ3vStrJKlCQZzGtHEYSNbUTVx6m4WVmNB0KCeROqwNwgP3Ok8kA3j5+iprwZ8OZ
-eCz/7PjCfvC7SxAgA3m2fcdeVe+ltbpbtlgAC06kU9IgvooeJLUfhhsHvnYHQRHy
-ijJ/6bFisa37qr1a+GmCVzW76nVBqWFszWpNDnz5hyGzvGCIFh8iCQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTAubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQ5/oq3PmnVQ/NbWp1Q
-91bEYAe1uTANBgkqhkiG9w0BAQUFAAOCAQEAzOYNmaM1gqEn0wO8+9mIxIG7Eytx
-oRlXguAqrvZB9mg9X3CX0ruVthjx2aYuKB0lfZ6isouqtmf4Y9jup0caVNZUhuYC
-WQTVubpZtqu2ILLJiA9hUzZo2Ssw79K9yDn92vLSIrJW+dux9WAc+ek+A+msGVYg
-/kgysYvip99GN3T0IzUFbVUITbglryDLCjkGKABDErW9/ALbGVtiJ6teYplVy8wc
-FlMHobu3JTG1rbnDWnyEzHkkmL79o8tDhvd0ouXHjOg1Yp+E8pntAFYE/R1w5ygp
-ji8cswM9Yt1R1XEuVvfx1+gSrAPMcshA+UQ+AAaSnER7opP8TCqpmFYAyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 81b0b13c..00000000
--- a/swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-10.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
-MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
-5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
-5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
-naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
-hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
-hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
-GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
-FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
-vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
-uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
-Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
-dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-10.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
-MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
-5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
-5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
-naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
-hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
-hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
-GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
-FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
-vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
-uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
-Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
-dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 443299c4..00000000
--- a/swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALrSDQvoje4uPkgco7EG5O/N9GX3XeA9GprsXYBpAqYQpHzzaYB6mcNcaXsnz7cocqL4RqjtBSj7LNzRFG/5NQkCAwEAAaN/MH0wHQYDVR0OBBYEFHDSjURO1SXIKXMy1kUcqH2jpatjME4GA1UdIwRHMEWAFHDSjURO1SXIKXMy1kUcqH2jpatjoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA+7dQ7+9uu9swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH3pW432rYPTTu+0nYXRW9RWiqVvCfiSpVP/i/8SizvI/CkMGusf5KeNf7R0sN8g46R4Hhyw0Zesyf7shcfsqZo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 620d568f..00000000
--- a/swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMEo0+TyDXm9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/a8N8t9pEJZFYtICHYoiFeSwXobYbhQGvEwOgvHYkHZVFzJMoSHEkhVU75KElE6Jbva7OvxvuaDjSio/cKbpkCAwEAAaN/MH0wHQYDVR0OBBYEFDdfJqJH49qu/R9U5/UZXiMKL7QLME4GA1UdIwRHMEWAFDdfJqJH49qu/R9U5/UZXiMKL7QLoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkAwSjT5PINeb0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEusDBOT2mhns8L1zDUd0OAY3mtsaCuYn8dKIh4EC2QGvk5wpyslElwcJTnnpihRB9pRgWJxbxgQF+ExL8JTF4Y=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAMEo0+TyDXm9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/a8N8t9pEJZFYtICHYoiFeSwXobYbhQGvEwOgvHYkHZVFzJMoSHEkhVU75KElE6Jbva7OvxvuaDjSio/cKbpkCAwEAAaN/MH0wHQYDVR0OBBYEFDdfJqJH49qu/R9U5/UZXiMKL7QLME4GA1UdIwRHMEWAFDdfJqJH49qu/R9U5/UZXiMKL7QLoSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkAwSjT5PINeb0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEusDBOT2mhns8L1zDUd0OAY3mtsaCuYn8dKIh4EC2QGvk5wpyslElwcJTnnpihRB9pRgWJxbxgQF+ExL8JTF4Y=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8452/idp/profile/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/nya-10.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-10.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 73ab1c34..00000000
--- a/swamid-2.0/nya-10.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-10.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
-MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
-ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
-crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
-Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
-KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
-6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
-/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
-5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
-JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
-pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
-zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
-H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-10.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4ng+2mpzLjMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQwWhcNMjAwOTE0
-MTQ0NzQwWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2yvAxQdxqb4/yf9+ewZXbdc9/WBZPvmc
-ZlKby1eLDpnEhgE1U+kKKyRKhoYTQXYGF8kdcvlupktrbDeiumqprdcizHcHk8xm
-crNT3wkh7AXVpQzasQacwS+SQ5LR1GzyR69z9U9NQB4vURsp/sFZBtN1DMyLcVmb
-Y1qTQG7yzvIZI0ZrKVS5yvfZSvY0YFoSAoBXm4aTdR/EGHDWSJwlrJpEKcSwOS+M
-KbjfPVX7Qet5igxQ//pANx1RnEdIT2i9dwTfGHWyZJmiIiEfI1R2xnbsk9eztyDV
-6AsxV9mgywH8II3yau028x6yhsW0Y11+dQqW2u4If93l8pVtQC1eJwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR1IrVGQRi3VkXTlBIGJhs3
-/rx8mDANBgkqhkiG9w0BAQUFAAOCAQEA1Aq5b9z9QDg68A98d9JNVLvxpf0QubYN
-5omV/jiFly4ca99WJ1Nbv7euPAzFBENgRP3v/THgnUVKQqxOMS8i+5VF7BYpiL9h
-JT5EE5AIzV2zMbrtyXJuNxR8e33CT5DKY696CADCGl3kuIYiHuSCUo2CaMtHA3Dy
-pFB1OPoffqg0Y+c2KMPV+ksrPVZYps3Yqma/f9xfoGVQ3BJVUD6vCiRuwYq7C8Re
-zVfsPT/8DTfaDPRpQPADXdmQN+qXKon8+75eWaQG+/KjR8EgRpjCckTqJ9UpXJen
-H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index f3be07af..00000000
--- a/swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzQxWhcNMjAwOTE0MTQ0NzQxWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u656iMGaWUgETEJOc6qs8g2HbAGkuZp4kzKYrSrqlhMMu7unQZphTATBjlwvTpWJOiUC7Fu8yzhMJ44Dh3WMCAwEAAaN/MH0wHQYDVR0OBBYEFDmwp34M1H7qVXNe1P9btCHFv3n9ME4GA1UdIwRHMEWAFDmwp34M1H7qVXNe1P9btCHFv3n9oSKkIDAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlggkA/dGtgc4kRAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEM4thrzetm8yg3N4sPzFJ9m+6jaT9DSp3eqVFBHv5exE4R8x1EPDh3Cdw9AWjzhzeeVOQayymnoDaHyZXpRZo4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-11.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 735c61de..00000000
--- a/swamid-2.0/nya-11.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-11.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-11.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALpIfpUa+WdbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDI2WhcNMjExMjEz
-MTQxNDI2WjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxO5S7OhVa6uVG0RKmUebRCg9vgJYCZWO
-bAubLGgC9Qw4No7x9M51xQH6TTRKyqDfxIj9AsbTtaEZvGra0Xl30ROTZOu727nb
-4g+ZT/w9M45+7ezQKy7hdAYNMjVkrNStHWz1YMbGPmuGwiNgbekmfJMTPFf14B4a
-MVorewMC3M3OKJd6ONDE62wqZLRKDE/T5oCPOFmwOJlENRdAKkOmwkn4IWrr5UW4
-GvFh4tn9vSipTFuwu/1cR/9yqfgn5CKblYDY1EwpfcWzCbbMD6b/MZzS+PhyI9/N
-SvP/WEj/UNYPScdT7D1ovc1We2a8McXxsLRS+w+oLVoL8eOxRqWKBwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTEubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQBo17maH5ODAn/VPCP
-s8D9Wt7XoTANBgkqhkiG9w0BAQUFAAOCAQEAXAUI7+d/hlli3nl/l1DXQLMoSOKg
-Ot2eNEehtm1/HeBwpPWeTgUzd+cyjCIXUAa+dFbior+kIA9c7NbOdmD98QR8ElTL
-bObf8p0knYBkiE0ncsRPT75MQRW7YaxIw7bWbXMOVI+qk8lwKfqrXeU8rkSJf7EL
-cDF+nboWwRTJXwug/jhtUycfhvBNR4/oZT4WJvsl4XvNaXPYZFo1cF0LaHvlSbyt
-0vnM9PhtOw8uak83FZze23DY3lBgrHKU/IPdMyMdppem4ZGWahDxHj8YIlzO03/q
-ee2cPMLHZ8uTBXSNov8FszLqVb+2fSkTkc8L3Jvnc979iizqAcW/c102dg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-11.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index e69b1a92..00000000
--- a/swamid-2.0/nya-11.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANb8j0UdRcJ4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMxWhcNMjAxMTIx
-MTIxODMxWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqCfR0V7+rer43zcCRgkZYuFcuFLJlfN+
-2a0WDv6arjP/kYfS+VU/8nW2PYoDqlwLgkl8PiIAHUvmRmmOvxBeMmaFyT+MHw1m
-BhY+Bg4dp15Ajl4NwBMn59Wjz/qz3ohWUH/AZHQvMYyKIUiNVHLa3Kk6gUz0Delc
-08TwcnLk7osHrPQuqS5QGMN364C/rAqFIWWPmu192NRFAVw4Cq3Z8GrUwqaozSzp
-UVJXk9ffFIZTY3tmbRTkFzd9+MH7GCmEiMPSYyUJvsdtuItJuSJ6pasCmy0M+St3
-RtAEYB4DN7L58ucGrbHTXZKG9xEC6DaczxhtgC69obSVBBfwxFtCqwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTEubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTjP+JPDMoqN8xWuXWXtUjr
-dblSxjANBgkqhkiG9w0BAQUFAAOCAQEAh7b7loLru7mSNGUL0wZa8PDxrLOFRX5O
-BHqnxviIn/qK9Jz4ptGgJQUI4K6KT3xKZtzlVkOLrfN8esFHPtkKNNQpTsftlhdF
-2avGCsg4KSIGSxQaVRJFpFT8NkbvKe6fIbpRHmonvH82yfTLmBPE5OiDcACIkJKU
-3z17iqiUGAPxN9kMV1NoAuQAx7HYymObf1cs2jpsmvCeTNkM85kA4Otv+eK70qCs
-iTxWo573hhl2VxzAB8GsClA6dX4w6rB8OLBosiHAioNOmtGpzNwePkXyIod8oRb1
-Yhj3Ud+jxptxLC2+YavcV0QU7WBCIl9InE1oR8rAjpGVjGSO3U/6DA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANb8j0UdRcJ4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMxWhcNMjAxMTIx
-MTIxODMxWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqCfR0V7+rer43zcCRgkZYuFcuFLJlfN+
-2a0WDv6arjP/kYfS+VU/8nW2PYoDqlwLgkl8PiIAHUvmRmmOvxBeMmaFyT+MHw1m
-BhY+Bg4dp15Ajl4NwBMn59Wjz/qz3ohWUH/AZHQvMYyKIUiNVHLa3Kk6gUz0Delc
-08TwcnLk7osHrPQuqS5QGMN364C/rAqFIWWPmu192NRFAVw4Cq3Z8GrUwqaozSzp
-UVJXk9ffFIZTY3tmbRTkFzd9+MH7GCmEiMPSYyUJvsdtuItJuSJ6pasCmy0M+St3
-RtAEYB4DN7L58ucGrbHTXZKG9xEC6DaczxhtgC69obSVBBfwxFtCqwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTEubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTjP+JPDMoqN8xWuXWXtUjr
-dblSxjANBgkqhkiG9w0BAQUFAAOCAQEAh7b7loLru7mSNGUL0wZa8PDxrLOFRX5O
-BHqnxviIn/qK9Jz4ptGgJQUI4K6KT3xKZtzlVkOLrfN8esFHPtkKNNQpTsftlhdF
-2avGCsg4KSIGSxQaVRJFpFT8NkbvKe6fIbpRHmonvH82yfTLmBPE5OiDcACIkJKU
-3z17iqiUGAPxN9kMV1NoAuQAx7HYymObf1cs2jpsmvCeTNkM85kA4Otv+eK70qCs
-iTxWo573hhl2VxzAB8GsClA6dX4w6rB8OLBosiHAioNOmtGpzNwePkXyIod8oRb1
-Yhj3Ud+jxptxLC2+YavcV0QU7WBCIl9InE1oR8rAjpGVjGSO3U/6DA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 0be5759b..00000000
--- a/swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOD1v94MfUg7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMzWhcNMjAxMTIxMTIxODMzWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANhiKrdBKKMgbq+7RYDykBMWJwC5VD5Ml0nk7sA4Ow/5iK6CPngo+xbja40zYHlgnt6XZM86veYurP0Wvoe1/eUCAwEAAaN/MH0wHQYDVR0OBBYEFNygyxHSHhB8lvdUIDNzblaMy4BGME4GA1UdIwRHMEWAFNygyxHSHhB8lvdUIDNzblaMy4BGoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkA4PW/3gx9SDswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADuQczgEjD9Uno3wg9rjGwBOfe4p33yoAgQbWiYfQLlIdwDqGOleleuLIyMwl+XdUPvxZen2XWpUVvriUYqAd+o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOD1v94MfUg7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMzWhcNMjAxMTIxMTIxODMzWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANhiKrdBKKMgbq+7RYDykBMWJwC5VD5Ml0nk7sA4Ow/5iK6CPngo+xbja40zYHlgnt6XZM86veYurP0Wvoe1/eUCAwEAAaN/MH0wHQYDVR0OBBYEFNygyxHSHhB8lvdUIDNzblaMy4BGME4GA1UdIwRHMEWAFNygyxHSHhB8lvdUIDNzblaMy4BGoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkA4PW/3gx9SDswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADuQczgEjD9Uno3wg9rjGwBOfe4p33yoAgQbWiYfQLlIdwDqGOleleuLIyMwl+XdUPvxZen2XWpUVvriUYqAd+o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 695c1680..00000000
--- a/swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJTYM9SYrSXSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKo/IDat4E95yZ7aJfxNFchadvdSbfbyogJwoTio7aD1GTSrTyoQn9OSdT2jUk2wpbnHptfQpn3v2GvyzU+sfQkCAwEAAaN/MH0wHQYDVR0OBBYEFG04HhheVVkX2H5US7A4zfj3/08DME4GA1UdIwRHMEWAFG04HhheVVkX2H5US7A4zfj3/08DoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAlNgz1JitJdIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD+hVvsZBbErHM/dYqvr/9eOCNhkiqKZWj8ZJ4+XrCpFlfr9iTDkD1WR9XflHeQHuwpzDrbZXZG3h7lwgK9kpck=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAJTYM9SYrSXSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKo/IDat4E95yZ7aJfxNFchadvdSbfbyogJwoTio7aD1GTSrTyoQn9OSdT2jUk2wpbnHptfQpn3v2GvyzU+sfQkCAwEAAaN/MH0wHQYDVR0OBBYEFG04HhheVVkX2H5US7A4zfj3/08DME4GA1UdIwRHMEWAFG04HhheVVkX2H5US7A4zfj3/08DoSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAlNgz1JitJdIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD+hVvsZBbErHM/dYqvr/9eOCNhkiqKZWj8ZJ4+XrCpFlfr9iTDkD1WR9XflHeQHuwpzDrbZXZG3h7lwgK9kpck=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8452/idp/profile/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/nya-11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 1414b868..00000000
--- a/swamid-2.0/nya-11.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK2Rn0ue0XijMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMyWhcNMjAxMTIx
-MTIxODMyWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1G8hSmU2aJNRYqhtzTDYKXvSGla4zGMm
-zJ537Xf8FfgREoooCLQFnNRztGKvnZk/6R9NJA1LfzYkrU77EQlN8HG77NcAAZmS
-e1Uq8fkyOgCngFMSh/Ltc/lfmJlTx2jumkVjXWbvGDI9FHv/7aY1J9VKrIXDtWw2
-+qsIo/yoeh1YjgwWq1G43D3KpEGkUfHoDSqkrqvQhUUZbebd2uRDck2/Dyc7lczQ
-zPDeWGgXwiFwfzEYijJP9C6WSSZbGUUPkuvmyFM8y57E4zAPLVK+LsRzUUMXVKEx
-K0hUxbW8r2gU9naUcGyZET7Em50SDvgcodGvJOm5XV1vCL5xvsENLwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTEubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRuf2bqHYwidTb+1cv8gHm3
-yZ7wHjANBgkqhkiG9w0BAQUFAAOCAQEAqJrAde9Tha1fV9MpQMDrcbVB+WJShcpa
-PQDPuyNEglzPg4LOr8l+6blVccJpsTofn83mQwsLFKC5EJFOJXi4SycKClXKLfoW
-EbiVOaHn09CzFMCGoF51remi0Z27whDobX3xbZGLjbCIr8PevH+fd9MCqHIqA/Rn
-nFZLN4c8l7CrG/PkmPfRyVziSIBmaQaUaPuxz37KBfyJFKdu4drR/g0nYhFRHrvF
-fyqdXb3s6ov7+dPe1+Rlar/ej21wUhvjAuMyddVEQIA+AQ4+svmQ06+9qVuKGnUY
-I4tiNRJDuFIy2L7PegtOwoBAm9rDP5c2Q06DX+t7nFulPL9mWLufmw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK2Rn0ue0XijMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODMyWhcNMjAxMTIx
-MTIxODMyWjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1G8hSmU2aJNRYqhtzTDYKXvSGla4zGMm
-zJ537Xf8FfgREoooCLQFnNRztGKvnZk/6R9NJA1LfzYkrU77EQlN8HG77NcAAZmS
-e1Uq8fkyOgCngFMSh/Ltc/lfmJlTx2jumkVjXWbvGDI9FHv/7aY1J9VKrIXDtWw2
-+qsIo/yoeh1YjgwWq1G43D3KpEGkUfHoDSqkrqvQhUUZbebd2uRDck2/Dyc7lczQ
-zPDeWGgXwiFwfzEYijJP9C6WSSZbGUUPkuvmyFM8y57E4zAPLVK+LsRzUUMXVKEx
-K0hUxbW8r2gU9naUcGyZET7Em50SDvgcodGvJOm5XV1vCL5xvsENLwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTEubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRuf2bqHYwidTb+1cv8gHm3
-yZ7wHjANBgkqhkiG9w0BAQUFAAOCAQEAqJrAde9Tha1fV9MpQMDrcbVB+WJShcpa
-PQDPuyNEglzPg4LOr8l+6blVccJpsTofn83mQwsLFKC5EJFOJXi4SycKClXKLfoW
-EbiVOaHn09CzFMCGoF51remi0Z27whDobX3xbZGLjbCIr8PevH+fd9MCqHIqA/Rn
-nFZLN4c8l7CrG/PkmPfRyVziSIBmaQaUaPuxz37KBfyJFKdu4drR/g0nYhFRHrvF
-fyqdXb3s6ov7+dPe1+Rlar/ej21wUhvjAuMyddVEQIA+AQ4+svmQ06+9qVuKGnUY
-I4tiNRJDuFIy2L7PegtOwoBAm9rDP5c2Q06DX+t7nFulPL9mWLufmw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index cb295d43..00000000
--- a/swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKNu6sSUB8iCMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM0WhcNMjAxMTIxMTIxODM0WjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMP1s7FqfCLa/7JjnUt/ozFU65AXJxyFQuOM0wFwhajuXi98GzxDYFoC/NrMVxdNy64szP3ivqoMxJ5hxyr6Lm0CAwEAAaN/MH0wHQYDVR0OBBYEFDX59uQwWp2FIyRH8D4+r93lOxN7ME4GA1UdIwRHMEWAFDX59uQwWp2FIyRH8D4+r93lOxN7oSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAo27qxJQHyIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUnZ5tebvOvgVR2nUBV5VvDF2jWHcK62dAA1VEr0YSaUruFsYnkUDbDh/6xe5hiZJ5qVktwtOUoyt2TPuv40uI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKNu6sSUB8iCMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM0WhcNMjAxMTIxMTIxODM0WjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMP1s7FqfCLa/7JjnUt/ozFU65AXJxyFQuOM0wFwhajuXi98GzxDYFoC/NrMVxdNy64szP3ivqoMxJ5hxyr6Lm0CAwEAAaN/MH0wHQYDVR0OBBYEFDX59uQwWp2FIyRH8D4+r93lOxN7ME4GA1UdIwRHMEWAFDX59uQwWp2FIyRH8D4+r93lOxN7oSKkIDAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlggkAo27qxJQHyIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEUnZ5tebvOvgVR2nUBV5VvDF2jWHcK62dAA1VEr0YSaUruFsYnkUDbDh/6xe5hiZJ5qVktwtOUoyt2TPuv40uI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-12.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-12.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index becb8eea..00000000
--- a/swamid-2.0/nya-12.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-12.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-12.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO9geC1venNIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDI5WhcNMjExMjEz
-MTQxNDI5WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo8YVVRbZCXGp/edNijfCvNi+Atz5PvCP
-jDwxZ349b1dSs6Lm+TDLfQ6AMIFki7sb3eboSBFKc75v582uxspN3oGd6Zo9ZmAV
-zX8kWmTkj3GirtCVUvtOMldTHcbFD2ff9XgP90blIzHkT3cWPoKVSQdabyNduTSz
-Dm7DCQwGCvD/mHEf8fklDRnod1tG0ZMUwUCnvQqzA/YlSVHnflwXU95UwP+ykw8F
-BFnOgm2N9+Soj7u7Oxfti88DffoGfWTOWu0YXVGlq2YyZLtRBnuytrE0G3K1SuIs
-rrWHHPVpCiHC4yWB+Qm9QLxNXIPzcD9kl/v1Yq4aEt6cU26VMc9RywIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTIubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSNCha6oR3qcNdiEmii
-SR3sZT8vdzANBgkqhkiG9w0BAQUFAAOCAQEAjV3C9I25EeQVopA5ReEqiAjVaKda
-li9uj4wJfKnLm6VJliQvx4D0uP012e930dwKIilP9rRZifkZA6g7B8YJqht4BeQ5
-70NCkpBgWzEYj1jrWwyONYIlMzZgcr/mRkf7pMK//J1iV9e1RTY/VMNaDr+2H46R
-9RtJ//YzGhMizyh7icfsl1pGeWaWVOMNCndR70mkqJKMchDlwEmt7KXYXaI3qhvI
-KcF3SINo8nkQKFmGR41FMhNu8tCJAbLM/Khg++ctc5HBuw3nM42AogcyBCe0Nxps
-D0eoqGxLTvTqC2+hDxNXRe1LrUoaBIvcLqssy5jvjRX+vi0ckO5RddMIgQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index e5278d11..00000000
--- a/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-12.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-12.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO0W/XGdFVEaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM4WhcNMjAxMTIx
-MTIxODM4WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQ8oGOYvUseq+VwmjcD9KrTE0a6FYIcP
-L6f+HNg8onJIaIJoacq/XbslAP5M7+w4feV6sd6Nl5nnj7xzpN8SabN3kcxDhPtx
-8P+uWTSP4NYYCaPoI257mdgtAZVgU8VyjMaw/GkuIX7LtMWkECCp5gjhxsxCkUm8
-epWi5QMND0IpBuITwgyY5IdeJKf2VkxpVGetN4HLqGX4KwoA8SGa5Rq1tnkiq3Sc
-a7sfVkpZH0pZ1BL2rypzKyIaVRegh3rP0SAoDQxzk4wPd4RRIVHDrjjJ0nVBvLFp
-bmBXHYGcz9CcCtGx2hQ0Ks0T/Ecz6yMSj0HiROPzkvcnYNucwKIFhQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTIubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSK1oIfKBcJO3wMC41DGAmm
-VJ2tiTANBgkqhkiG9w0BAQUFAAOCAQEAWAhjUaqOxVHmtIvVV9EOj1fKo2J6nVPY
-a6eMz/D6zBuB6a65rkRp/6Ir455NBUN2MF9tCfS8aZrJm8UYeuzk7Bjvx9iBIO7O
-UljvJejwLRtcGlavyz71FcvLTUOV7lOYVt+xK0F4OoXeIUiKrhxoMFAlnf/3Qx9Z
-vJIAFf3qNg2amoQ9xja/pXJj7HsDCdEOIqhSeoqxP1Zgu/reJqCd/HSo//pC+Xxz
-c6AoJcfbdF3MmvViMoItA13RZPg5pr7SFdho8t+FKNoW/e0+J6l7+bRUthKCh92f
-Az4j0CNfaNbS78KQQcfiQxuTx9K1tyVdN42+LYD2jnfsXb9o8SbMGQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-12.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO0W/XGdFVEaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM4WhcNMjAxMTIx
-MTIxODM4WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQ8oGOYvUseq+VwmjcD9KrTE0a6FYIcP
-L6f+HNg8onJIaIJoacq/XbslAP5M7+w4feV6sd6Nl5nnj7xzpN8SabN3kcxDhPtx
-8P+uWTSP4NYYCaPoI257mdgtAZVgU8VyjMaw/GkuIX7LtMWkECCp5gjhxsxCkUm8
-epWi5QMND0IpBuITwgyY5IdeJKf2VkxpVGetN4HLqGX4KwoA8SGa5Rq1tnkiq3Sc
-a7sfVkpZH0pZ1BL2rypzKyIaVRegh3rP0SAoDQxzk4wPd4RRIVHDrjjJ0nVBvLFp
-bmBXHYGcz9CcCtGx2hQ0Ks0T/Ecz6yMSj0HiROPzkvcnYNucwKIFhQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTIubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSK1oIfKBcJO3wMC41DGAmm
-VJ2tiTANBgkqhkiG9w0BAQUFAAOCAQEAWAhjUaqOxVHmtIvVV9EOj1fKo2J6nVPY
-a6eMz/D6zBuB6a65rkRp/6Ir455NBUN2MF9tCfS8aZrJm8UYeuzk7Bjvx9iBIO7O
-UljvJejwLRtcGlavyz71FcvLTUOV7lOYVt+xK0F4OoXeIUiKrhxoMFAlnf/3Qx9Z
-vJIAFf3qNg2amoQ9xja/pXJj7HsDCdEOIqhSeoqxP1Zgu/reJqCd/HSo//pC+Xxz
-c6AoJcfbdF3MmvViMoItA13RZPg5pr7SFdho8t+FKNoW/e0+J6l7+bRUthKCh92f
-Az4j0CNfaNbS78KQQcfiQxuTx9K1tyVdN42+LYD2jnfsXb9o8SbMGQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 6f05ac3d..00000000
--- a/swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM5iqAQferc+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANVwYAXXV7b/vWTTy1jOQLwOsT0D46gPFA7tdiN54IHg/ujGrgOmAIkKmmdYCyp2KwuvTSK77P8HuuyxP4cpn3cCAwEAAaN/MH0wHQYDVR0OBBYEFE7CUZaNSU9t7G2MFT0CJZbVYS+4ME4GA1UdIwRHMEWAFE7CUZaNSU9t7G2MFT0CJZbVYS+4oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkAzmKoBB96tz4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKWclSMyitQ9oUQXMOFR9a/dFiF4dRgqInpN+tiY328Esgg9EYcBGbJfXU0LKynbNW/yxXSCgKdE4saJeFiLwbQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-12.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM5iqAQferc+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANVwYAXXV7b/vWTTy1jOQLwOsT0D46gPFA7tdiN54IHg/ujGrgOmAIkKmmdYCyp2KwuvTSK77P8HuuyxP4cpn3cCAwEAAaN/MH0wHQYDVR0OBBYEFE7CUZaNSU9t7G2MFT0CJZbVYS+4ME4GA1UdIwRHMEWAFE7CUZaNSU9t7G2MFT0CJZbVYS+4oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkAzmKoBB96tz4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKWclSMyitQ9oUQXMOFR9a/dFiF4dRgqInpN+tiY328Esgg9EYcBGbJfXU0LKynbNW/yxXSCgKdE4saJeFiLwbQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index d7b4fa91..00000000
--- a/swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPTA3cImC78JMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMEQ4TrvfZzLuoobaoOFWPDm08e8HO4PyM90Wz6Nf7Hj3HOnRqRfPuSMTMN7zKl1hfvWHsnj3EEu4SQz/r+1gLECAwEAAaN/MH0wHQYDVR0OBBYEFKixo3CSAfmMpIHHU0P82aUV1kN2ME4GA1UdIwRHMEWAFKixo3CSAfmMpIHHU0P82aUV1kN2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA9MDdwiYLvwkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAb5jPzG+RhntGrVkcsFo2xccsQzkRxMkcFlEpEZFSwbVuQokNqNhHB62cP2HsiYyEVrWUPYfoZNGljqqrRzj8M=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-12.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAPTA3cImC78JMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMEQ4TrvfZzLuoobaoOFWPDm08e8HO4PyM90Wz6Nf7Hj3HOnRqRfPuSMTMN7zKl1hfvWHsnj3EEu4SQz/r+1gLECAwEAAaN/MH0wHQYDVR0OBBYEFKixo3CSAfmMpIHHU0P82aUV1kN2ME4GA1UdIwRHMEWAFKixo3CSAfmMpIHHU0P82aUV1kN2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA9MDdwiYLvwkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAb5jPzG+RhntGrVkcsFo2xccsQzkRxMkcFlEpEZFSwbVuQokNqNhHB62cP2HsiYyEVrWUPYfoZNGljqqrRzj8M=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8452/idp/profile/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/nya-12.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-12.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 2f267ef7..00000000
--- a/swamid-2.0/nya-12.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-12.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-12.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3O2/oS6CyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM5WhcNMjAxMTIx
-MTIxODM5WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArSbX6jkI6JuvqNtkIC7+MejTdLEDjihW
-QHOEHffne2iOoTKfR0odzeqxgHV5oZ8/hFe/Y/EN2YskR4Xh/rVd6qQCMIANFufu
-J37UM/gztdse1EmTE5HWv+6dNfWewS2Ot2RMGQjZ5w9L3pgisBTHPkIxOh8P7qzu
-8PZD/t/l4jrq7k6Uw7CXzia415mvSHriOjrDDpzbs3xlqaOmyL9y/q64GxjKuf0H
-VDvK7jtLrc4Xaow/nv91cAcJaBpFrGvrhcwA54RRCxgV805aqJWuwFGgzHC7ZvWf
-V8mBw/zwAhpYQg7EpNqs0QV4zuUmYAxufvx1NpAXn+KGv1btHXh3JwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTIubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTginXpd3Zk6BZOWIGVbb8u
-gFOGYzANBgkqhkiG9w0BAQUFAAOCAQEAhxycmRJrt/FWTiTPPKsz1QG6PP7KDvzr
-VYpMIc3zrD2UvrQsRzaZqEzx3C7/baxqbiEKWqACxcG9qyzYDxLWWZsOjS8dUEsw
-089rct+jqYo59G4WZafu8dH4vWt6TVEctt5lKDQBqptMBX/n1pGUF9ZE43DHkdqr
-OIMtT81oO+3khS+HQ5EibA42Bn3BHn36sdeLCEHyv4smklX1YIFHmyu1xzA1S1N7
-JFMefJCxlUM/8LCGYgJMVphmVvDSGD82hTT6o0M8qxoA8O9aa4mEa98AJeSMo1tj
-WynBnDp4Kls1EPHgF/0Y7q7NEFyXT4oK4ck3493dfaX6s5viWysI2Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-12.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMC3O2/oS6CyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM5WhcNMjAxMTIx
-MTIxODM5WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArSbX6jkI6JuvqNtkIC7+MejTdLEDjihW
-QHOEHffne2iOoTKfR0odzeqxgHV5oZ8/hFe/Y/EN2YskR4Xh/rVd6qQCMIANFufu
-J37UM/gztdse1EmTE5HWv+6dNfWewS2Ot2RMGQjZ5w9L3pgisBTHPkIxOh8P7qzu
-8PZD/t/l4jrq7k6Uw7CXzia415mvSHriOjrDDpzbs3xlqaOmyL9y/q64GxjKuf0H
-VDvK7jtLrc4Xaow/nv91cAcJaBpFrGvrhcwA54RRCxgV805aqJWuwFGgzHC7ZvWf
-V8mBw/zwAhpYQg7EpNqs0QV4zuUmYAxufvx1NpAXn+KGv1btHXh3JwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTIubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTginXpd3Zk6BZOWIGVbb8u
-gFOGYzANBgkqhkiG9w0BAQUFAAOCAQEAhxycmRJrt/FWTiTPPKsz1QG6PP7KDvzr
-VYpMIc3zrD2UvrQsRzaZqEzx3C7/baxqbiEKWqACxcG9qyzYDxLWWZsOjS8dUEsw
-089rct+jqYo59G4WZafu8dH4vWt6TVEctt5lKDQBqptMBX/n1pGUF9ZE43DHkdqr
-OIMtT81oO+3khS+HQ5EibA42Bn3BHn36sdeLCEHyv4smklX1YIFHmyu1xzA1S1N7
-JFMefJCxlUM/8LCGYgJMVphmVvDSGD82hTT6o0M8qxoA8O9aa4mEa98AJeSMo1tj
-WynBnDp4Kls1EPHgF/0Y7q7NEFyXT4oK4ck3493dfaX6s5viWysI2Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 0f5989ac..00000000
--- a/swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOiPu5Yiq3ItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxucHWYbWCQsuSlfHfncy3UyrA82yL4tWZlmPNdjJE3QKGrhfJKum5JZJky5E+53G16EXZvIhwDweQYHKXSOPECAwEAAaN/MH0wHQYDVR0OBBYEFAEcaJ/NbUlh3Daztg6SutOyobU2ME4GA1UdIwRHMEWAFAEcaJ/NbUlh3Daztg6SutOyobU2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA6I+7liKrci0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEc6MiJT8ttc9fqvEg5BCq0s65pLeobSDzqG81c8UEu60+4+PvLRLNhIak9rURmFNiuZngdcRYHjfceJh36UhMs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-12.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOiPu5Yiq3ItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQwWhcNMjAxMTIxMTIxODQwWjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALxucHWYbWCQsuSlfHfncy3UyrA82yL4tWZlmPNdjJE3QKGrhfJKum5JZJky5E+53G16EXZvIhwDweQYHKXSOPECAwEAAaN/MH0wHQYDVR0OBBYEFAEcaJ/NbUlh3Daztg6SutOyobU2ME4GA1UdIwRHMEWAFAEcaJ/NbUlh3Daztg6SutOyobU2oSKkIDAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlggkA6I+7liKrci0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEc6MiJT8ttc9fqvEg5BCq0s65pLeobSDzqG81c8UEu60+4+PvLRLNhIak9rURmFNiuZngdcRYHjfceJh36UhMs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 7264ae1b..00000000
--- a/swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-13.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-13.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-13.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-13.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALL/tkObN6dZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDMzWhcNMjExMjEz
-MTQxNDMzWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2d6EOdxnw/cnpfz+sUBLp5jtL9oSMzX
-WSC/qSISv/VysAe6PJfQGhxfhb0PsH/WAiWJwFWmegImQ2DVzlGYOOdb+mM+AHrk
-/3AmNNijIzhG+/Zm8RdvX/ERgq64xGr2uGEHQxGMu21aabkjlUppIqUeX7bPki1k
-zG1DkMpf/6yVHsXYp3ks5HtBZSFRH2FsSdxTJZ4Z5AZO8RNIDXrxsEL+xYk2hzVx
-cjJHK9zE0iTCgZ4SRJ0lTC1ZuTBE5LP9rpONilozmHhY5V7ieg6fYyMX0njOArCu
-oknt4ISNrfo8xEbZJRCsbl6mSWSB/mcckv10DafpoGUNEYs/kc6iQQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTMubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSf8iP8ZKiWAM5iUEi/
-hDBlhMGe4TANBgkqhkiG9w0BAQUFAAOCAQEAqZYZRTtxEVSU2mVJXgZaxLiZ/dNv
-nMMbRqD6P9OXHrgkzqFWLsuo3STZviwOjroJNzGDot8fUwU0/wdlKYFuS0xQ+t03
-2ZfL3aX51+Y2yh4cBalqlGxSATFVux5tHzrcoXLaelkbeKJWPmTpgXTTvjB95mCn
-2iYJ/T8xFLsJZzTAEjanF3QYpEipJhxuxeqhmsvJ5E7QnGACwI1Og4AyeSeblYIh
-ef7RS+FSTgPUp3et4oXwKmUMdiFw7YnfeQcdaTmFlaX/lwssO/zPC2tvaNMOr6Nh
-ar1z5nbbSvQmbGQ9X3H3/JRxJ8pW/dJ/6fdEpNcaQ5mE8RFiL3xmX71sfw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-13.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-13.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index b16e0c04..00000000
--- a/swamid-2.0/nya-13.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-13.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-13.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-13.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-13.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMGbL5+gfBTKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQyWhcNMjAxMTIx
-MTIxODQyWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsnFhh5KzfTjMdm7309YPqcbWDc4e9Uam
-TNc+YB/GUo6CpxyDjulyONxLg8RiWAiBSc97m6aw7NdafrYEGblvaXCyxy5okltt
-S/gmuqdKRt9JbramvPW8DbQ/XWAx9mNmLzcOKUjY6AYAOOobTL1bsA3G9J51Qsw7
-boGH5cNGuxel9oKwCPDyar71yDZQP1n3Oj29Rj0ToAwxx+R1gskV0xE83rK8Gy85
-GpQjqUL5Hy2R0HSwAN4nVlEr8ucSakD1ZCjaCmB5rUJdGCjQM6KdglTFdbX3BKXJ
-0p4kZTTwSD18M7jetNeooscVnmAgTuRYkGX3EQzgEuTDRgqIURE7BQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTMubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRNz4t2Jny/o1n9wQCkNRYN
-q5E6yTANBgkqhkiG9w0BAQUFAAOCAQEAHehbcouLTOeuQzJdpYDdtFdo6hM0E4nY
-wtJ1/5dKepDnWjAp2Qj8tCfrCusTjtUm55IGXyynwg8SK9e+YSe79yMP3pMgqK4c
-CBZtfMOJPAeHj1URJQyfNgJ9VOeejIz0DFQTSmV2k8rjTIdJrrhR1XMi4zV7tyue
-8I57Jd5gX1Nmty8rJS6ZKA/P2fzH4H1SLlM35jPUr5a5twloNnMx3+0oUuVver9F
-rsmZ+zN7ChDRqsL+TG06PdLBrfyQkCx/CbdbJi7MkmfcfHzfMxXsEhJQ6nAtcaj8
-KOvo9bP1zEb49xBfOdXDCo0L2J++CLnLAeFzs4KnJIL5q/TSsgSquw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-13.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-13.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-13.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMGbL5+gfBTKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQyWhcNMjAxMTIx
-MTIxODQyWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsnFhh5KzfTjMdm7309YPqcbWDc4e9Uam
-TNc+YB/GUo6CpxyDjulyONxLg8RiWAiBSc97m6aw7NdafrYEGblvaXCyxy5okltt
-S/gmuqdKRt9JbramvPW8DbQ/XWAx9mNmLzcOKUjY6AYAOOobTL1bsA3G9J51Qsw7
-boGH5cNGuxel9oKwCPDyar71yDZQP1n3Oj29Rj0ToAwxx+R1gskV0xE83rK8Gy85
-GpQjqUL5Hy2R0HSwAN4nVlEr8ucSakD1ZCjaCmB5rUJdGCjQM6KdglTFdbX3BKXJ
-0p4kZTTwSD18M7jetNeooscVnmAgTuRYkGX3EQzgEuTDRgqIURE7BQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTMubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRNz4t2Jny/o1n9wQCkNRYN
-q5E6yTANBgkqhkiG9w0BAQUFAAOCAQEAHehbcouLTOeuQzJdpYDdtFdo6hM0E4nY
-wtJ1/5dKepDnWjAp2Qj8tCfrCusTjtUm55IGXyynwg8SK9e+YSe79yMP3pMgqK4c
-CBZtfMOJPAeHj1URJQyfNgJ9VOeejIz0DFQTSmV2k8rjTIdJrrhR1XMi4zV7tyue
-8I57Jd5gX1Nmty8rJS6ZKA/P2fzH4H1SLlM35jPUr5a5twloNnMx3+0oUuVver9F
-rsmZ+zN7ChDRqsL+TG06PdLBrfyQkCx/CbdbJi7MkmfcfHzfMxXsEhJQ6nAtcaj8
-KOvo9bP1zEb49xBfOdXDCo0L2J++CLnLAeFzs4KnJIL5q/TSsgSquw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-13.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 9e3a750a..00000000
--- a/swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMcAzXq0glwMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ0WhcNMjAxMTIxMTIxODQ0WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMIVMvH7CI4krt6mU6UHa9GFd4L+TOK/yNxNjG1+Ti1g2swD3xTo/vDgoBSskbocvYj9jhCL5rsvlCl3s7lldNMCAwEAAaN/MH0wHQYDVR0OBBYEFDwQJJNFIi5fzjF9MpqrLJAW9qDKME4GA1UdIwRHMEWAFDwQJJNFIi5fzjF9MpqrLJAW9qDKoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkAxwDNerSCXAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ5qPgGhML2DOJ95T7nSbZy/MTWKmgWxuHa/iiE9tT1nAlYOOgjRux/yVb0r4ybHgtKlbKwrTk1B18lbLVxq82I=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-13.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMcAzXq0glwMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ0WhcNMjAxMTIxMTIxODQ0WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMIVMvH7CI4krt6mU6UHa9GFd4L+TOK/yNxNjG1+Ti1g2swD3xTo/vDgoBSskbocvYj9jhCL5rsvlCl3s7lldNMCAwEAAaN/MH0wHQYDVR0OBBYEFDwQJJNFIi5fzjF9MpqrLJAW9qDKME4GA1UdIwRHMEWAFDwQJJNFIi5fzjF9MpqrLJAW9qDKoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkAxwDNerSCXAwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJ5qPgGhML2DOJ95T7nSbZy/MTWKmgWxuHa/iiE9tT1nAlYOOgjRux/yVb0r4ybHgtKlbKwrTk1B18lbLVxq82I=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index fba567b7..00000000
--- a/swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANhB8bHvFgrDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEiD0Y2J0Jx2Oj44ttwRhT7BgG+V1CIYlZuooERf1FPDID9SPcL49RdIab+GbVgaied/TufMqgZQjT+FBxHqDUCAwEAAaN/MH0wHQYDVR0OBBYEFKn/tAngPFBTwEWeClg12DcUz4+/ME4GA1UdIwRHMEWAFKn/tAngPFBTwEWeClg12DcUz4+/oSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA2EHxse8WCsMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHayMcM8zX1qGEJgRcte0QvxWfp/KSrYzHdGD0xAhWDxf/DaWl3V8onbfrUxd7UaNBJw+iZk34jcwD/rzOwX3mw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-13.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJANhB8bHvFgrDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEiD0Y2J0Jx2Oj44ttwRhT7BgG+V1CIYlZuooERf1FPDID9SPcL49RdIab+GbVgaied/TufMqgZQjT+FBxHqDUCAwEAAaN/MH0wHQYDVR0OBBYEFKn/tAngPFBTwEWeClg12DcUz4+/ME4GA1UdIwRHMEWAFKn/tAngPFBTwEWeClg12DcUz4+/oSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA2EHxse8WCsMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHayMcM8zX1qGEJgRcte0QvxWfp/KSrYzHdGD0xAhWDxf/DaWl3V8onbfrUxd7UaNBJw+iZk34jcwD/rzOwX3mw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8452/idp/profile/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/nya-13.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-13.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 9738112a..00000000
--- a/swamid-2.0/nya-13.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-13.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-13.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-13.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-13.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAP6KWbmjVwvUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQzWhcNMjAxMTIx
-MTIxODQzWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0h1egkxyyRD2GKGB6rrCjq62IiB0GL3x
-JKznMe+qqzOHtK3Q+SOyA/V5nDuTZHHypmAJSJwnepA5LTqkN/0YOrSD+bMC8Hv7
-F9gc+6195KfLQL7q2WSqJs0L6e2VEuVuPkjaoDs5jaeHiy2ITqkeuXvOGVpPBroa
-7cD/z1dQmSSPozPSg1QVPj1tanISguvsQmK94L9ga+NXvFzIF8FOq9QlsRVaDobv
-dd2ZaSCLdXeFI+Mm3FLsF48kWrh4fZ35kesJNz19XWwgXLMif8IN40XDPJ1QG7nE
-mzOLvBVu1jBDZm/N3oSn43dB9ogQBIjIxiq3QFyCK9sdbWXeJKz09wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTMubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRXmvH61/pQDLsuCIF1C4ch
-K8V66zANBgkqhkiG9w0BAQUFAAOCAQEAWrWTCsygQ1Y8Vfe65vmKhPTpPlYirEwX
-ALIDXn2GVxoF5az8G/yxs5MtBR6FJFx6LOgfhN08I7wQTijHDRkCSi3DWzTKviBg
-xxo9wUjI2TXzh2OEEtbreB5f8EBgca1BsQLiM+1x/zCcbKv56WvUzQWNiPUjyKEE
-NtdrkecHFqne3nTtCEBvSpc6vimUwtkdV4+lwF4Idi9HmcVkVHPdSnWGyCYj7Qfz
-lpwaurCsvy4YpBflWcmUTmswCpcxTOVjoJ8/rGDhsoXb6nBvyHVxwp4zodfj0D+A
-ckYXvx6nFZB64nlo6U7iGtYOOTI8Q8een1wwWi55ewy1ptdyuk9B2w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-13.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-13.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-13.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAP6KWbmjVwvUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQzWhcNMjAxMTIx
-MTIxODQzWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0h1egkxyyRD2GKGB6rrCjq62IiB0GL3x
-JKznMe+qqzOHtK3Q+SOyA/V5nDuTZHHypmAJSJwnepA5LTqkN/0YOrSD+bMC8Hv7
-F9gc+6195KfLQL7q2WSqJs0L6e2VEuVuPkjaoDs5jaeHiy2ITqkeuXvOGVpPBroa
-7cD/z1dQmSSPozPSg1QVPj1tanISguvsQmK94L9ga+NXvFzIF8FOq9QlsRVaDobv
-dd2ZaSCLdXeFI+Mm3FLsF48kWrh4fZ35kesJNz19XWwgXLMif8IN40XDPJ1QG7nE
-mzOLvBVu1jBDZm/N3oSn43dB9ogQBIjIxiq3QFyCK9sdbWXeJKz09wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTMubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRXmvH61/pQDLsuCIF1C4ch
-K8V66zANBgkqhkiG9w0BAQUFAAOCAQEAWrWTCsygQ1Y8Vfe65vmKhPTpPlYirEwX
-ALIDXn2GVxoF5az8G/yxs5MtBR6FJFx6LOgfhN08I7wQTijHDRkCSi3DWzTKviBg
-xxo9wUjI2TXzh2OEEtbreB5f8EBgca1BsQLiM+1x/zCcbKv56WvUzQWNiPUjyKEE
-NtdrkecHFqne3nTtCEBvSpc6vimUwtkdV4+lwF4Idi9HmcVkVHPdSnWGyCYj7Qfz
-lpwaurCsvy4YpBflWcmUTmswCpcxTOVjoJ8/rGDhsoXb6nBvyHVxwp4zodfj0D+A
-ckYXvx6nFZB64nlo6U7iGtYOOTI8Q8een1wwWi55ewy1ptdyuk9B2w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-13.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 6930501f..00000000
--- a/swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPWvSRoLpY6pMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ1WhcNMjAxMTIxMTIxODQ1WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8tgFGJ4NYVnsRydcbNd6aMuT9ugcZ2XFLdc4a6yFYOHB/YdTywRnLUgVK+nnbhXoIBa+u4pWwZ0Q7P04ErcqsCAwEAAaN/MH0wHQYDVR0OBBYEFMGJSwi5UwFnZ90jBdr9+zw2XQpPME4GA1UdIwRHMEWAFMGJSwi5UwFnZ90jBdr9+zw2XQpPoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA9a9JGguljqkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC4mUcOfrC2eYn7EULhIvOUJ4X9BMRUosM7OCjUrKjYgM3Mb5VO6bF6GXCqTBhWyRSsRUFhMfl+pefRLjApBCEo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-13.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPWvSRoLpY6pMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODQ1WhcNMjAxMTIxMTIxODQ1WjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8tgFGJ4NYVnsRydcbNd6aMuT9ugcZ2XFLdc4a6yFYOHB/YdTywRnLUgVK+nnbhXoIBa+u4pWwZ0Q7P04ErcqsCAwEAAaN/MH0wHQYDVR0OBBYEFMGJSwi5UwFnZ90jBdr9+zw2XQpPME4GA1UdIwRHMEWAFMGJSwi5UwFnZ90jBdr9+zw2XQpPoSKkIDAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlggkA9a9JGguljqkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC4mUcOfrC2eYn7EULhIvOUJ4X9BMRUosM7OCjUrKjYgM3Mb5VO6bF6GXCqTBhWyRSsRUFhMfl+pefRLjApBCEo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-14.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-14.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index d588a95b..00000000
--- a/swamid-2.0/nya-14.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-14.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-14.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAL/SvvUQuNCoMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDM2WhcNMjExMjEz
-MTQxNDM2WjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8V8spvD86KaqKD5DbHpdEA9S4/3Eriic
-o2tdFmiBggHKDyGJ0WSo+N2BRNCjQEDewlByCqpFQ5H8dsNfvps4A+RPpdWlJrFp
-KO3qfFG9SF9JLIWs/f0CZEVj0h+/11+bIJWRU6b7QNUTwJ6HjmJyTByBzBS5Y+75
-tS6QNQNaKly1xfFgvcaECLk1dIrOPt3kQ5rxypJ8UQdVAoeAA2tE3/GhvvDKO39O
-l0HVS1JkvXW8hnHXX5t5VdTyK1bFRQOoe9KvoCnWJ2AQKRc5qrBZCcjOqJ9Jntna
-DH0fSMANRHSSkRX/hskzoOd4eWdQTP4u+BYCxXG4sG7+Zm8uD89BGwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTQubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTGqUFSrHWGKqy+L3DI
-gYXHufOhmzANBgkqhkiG9w0BAQUFAAOCAQEAHIBLwS0e9JjzU668fBEOPtYma6Lh
-nZqIYAZhDAmrm5HVRGJdW3zClprWePRMW6DvSgWPYjgVrVb9Dd54+YIZLC61PKYR
-QQFcd1er2rXO68djIDZToHAb/O6bCxjq3Kg9HSX1kQ6HvWMrLixJyq8HH++zSmL1
-2YcgGKCFDgIR4JmUcKUostcwrfn+HEnm2YrMDxGAOxKkwMkUC2XA83os/AwaK0zM
-ZeWHUJ7G/swyYxw1UwtS+gdeCjKd91Ua1qSSCgv8HztqgPgzMtDP0bHic1pyFZKs
-8aq4wlCum7mkVAGtIWQwJkmuxXNeWkqM/jblWVqUtQDkIl2Ft1F2wdtRsg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 3bd694d1..00000000
--- a/swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-14.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-14.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPybaQo1q31gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUyWhcNMjAxMTIx
-MTIxODUyWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+dRPBZga+AS+u9HSrTHA5iYr/KkPeFS9
-8nwzFLG4vnUklfcYfIlmFNjfJFGG5ApmxGbolaooXd4ltJP5tTipBfF9mPBdj8Pb
-JX0CFgg34o4SeM4tdig0SUwumdOS61vPH9Bx3MYjqSz5wkd2Y1XDB0GYx8Dc5qRT
-PQicd+B4Va7H0cA8JVKvGt+scgHdp52qyRH3AYijxD5ZimGZ6aNL+0vyOIMSl2Y2
-5blZV5/MQ3SvAzG6pZclrjxX8D87h9uek5IpDDOrsFZDtvKB2neSwobQYndiy1hr
-kjwCTDmvyVoewiGP1l14wiETfd+uNSEZPniITYbjy8OXhpZhcijdgwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSe9n7Mlu7vGc/mVMs3UDpy
-krWPVzANBgkqhkiG9w0BAQUFAAOCAQEAmz7Ue6S2LBzWJD1Yze3hIF41EIu5E3Eb
-qggEkT3qAmiHLiD9uI44wH7PuJR6ixyPmVcaOtDqrBCym6ysfh3cEvghKWAn2/FR
-iOMb8g4zw/UueqvCYmvJK5Pw5y0ZPX/wBj/zUN7z5TXpIxACx64eV0zln0yiCaPy
-/N24IISXkumXVp2L8nSveqWH1crjxqy5nzlA08lo1E4O0v66zCZkLNJHizG61K82
-8b8QJqeX155IKEm4ebd4CgzUvr8/eFQR00BH/ofSw5eGpvghOtXDFtFoX5TF8/wJ
-Nv4iQyOXosX6n4U5VL/OwTA+TIM2I07U3eJfoqIr6eLvYVcEHiPMzQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-14.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPybaQo1q31gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUyWhcNMjAxMTIx
-MTIxODUyWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+dRPBZga+AS+u9HSrTHA5iYr/KkPeFS9
-8nwzFLG4vnUklfcYfIlmFNjfJFGG5ApmxGbolaooXd4ltJP5tTipBfF9mPBdj8Pb
-JX0CFgg34o4SeM4tdig0SUwumdOS61vPH9Bx3MYjqSz5wkd2Y1XDB0GYx8Dc5qRT
-PQicd+B4Va7H0cA8JVKvGt+scgHdp52qyRH3AYijxD5ZimGZ6aNL+0vyOIMSl2Y2
-5blZV5/MQ3SvAzG6pZclrjxX8D87h9uek5IpDDOrsFZDtvKB2neSwobQYndiy1hr
-kjwCTDmvyVoewiGP1l14wiETfd+uNSEZPniITYbjy8OXhpZhcijdgwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSe9n7Mlu7vGc/mVMs3UDpy
-krWPVzANBgkqhkiG9w0BAQUFAAOCAQEAmz7Ue6S2LBzWJD1Yze3hIF41EIu5E3Eb
-qggEkT3qAmiHLiD9uI44wH7PuJR6ixyPmVcaOtDqrBCym6ysfh3cEvghKWAn2/FR
-iOMb8g4zw/UueqvCYmvJK5Pw5y0ZPX/wBj/zUN7z5TXpIxACx64eV0zln0yiCaPy
-/N24IISXkumXVp2L8nSveqWH1crjxqy5nzlA08lo1E4O0v66zCZkLNJHizG61K82
-8b8QJqeX155IKEm4ebd4CgzUvr8/eFQR00BH/ofSw5eGpvghOtXDFtFoX5TF8/wJ
-Nv4iQyOXosX6n4U5VL/OwTA+TIM2I07U3eJfoqIr6eLvYVcEHiPMzQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index efd88005..00000000
--- a/swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOhZAAB6dbhUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIxMTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYI2pI8Qx3qXRAuoWoLzX8EnuZtB7S1AH9BHmLQrK3egX0tuvF9LSRbow1cE4LBC/AAsep0vrXBvA/Pc0MepG0CAwEAAaN/MH0wHQYDVR0OBBYEFBCNHd+G+aR8LQkQ2oxuG+CJR1VWME4GA1UdIwRHMEWAFBCNHd+G+aR8LQkQ2oxuG+CJR1VWoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA6FkAAHp1uFQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEMAE2PJ6WQwbFWmqZD/+gwsEK5b5JKt3eEsf+MqZSemZhmAmWINNAPYjdTcnUkN62oI1Cei4ndDzD1x5tII1HY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-14.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOhZAAB6dbhUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIxMTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYI2pI8Qx3qXRAuoWoLzX8EnuZtB7S1AH9BHmLQrK3egX0tuvF9LSRbow1cE4LBC/AAsep0vrXBvA/Pc0MepG0CAwEAAaN/MH0wHQYDVR0OBBYEFBCNHd+G+aR8LQkQ2oxuG+CJR1VWME4GA1UdIwRHMEWAFBCNHd+G+aR8LQkQ2oxuG+CJR1VWoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA6FkAAHp1uFQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEMAE2PJ6WQwbFWmqZD/+gwsEK5b5JKt3eEsf+MqZSemZhmAmWINNAPYjdTcnUkN62oI1Cei4ndDzD1x5tII1HY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index c21ad583..00000000
--- a/swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKVuYUnkM40CMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMgQ40VoYizXIJzS/qJbOShmDvad+66e/9tR2ROYm+Vdk4EBwy6kolRDRbuCWLnsgwV5FaBXlaUsw8gtCoAy6GcCAwEAAaN/MH0wHQYDVR0OBBYEFLFkOAfP5Z6ZYdRVj7QPgjIquSiKME4GA1UdIwRHMEWAFLFkOAfP5Z6ZYdRVj7QPgjIquSiKoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkApW5hSeQzjQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEOBTsWn5X3pB0hta401DhV2MO9xIMA0GdqTLnuujAMqTOoDtFC1sdT+iD0m48MK0Wdfyz4jfnV+XfCh4pcCD8U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-14.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAKVuYUnkM40CMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMgQ40VoYizXIJzS/qJbOShmDvad+66e/9tR2ROYm+Vdk4EBwy6kolRDRbuCWLnsgwV5FaBXlaUsw8gtCoAy6GcCAwEAAaN/MH0wHQYDVR0OBBYEFLFkOAfP5Z6ZYdRVj7QPgjIquSiKME4GA1UdIwRHMEWAFLFkOAfP5Z6ZYdRVj7QPgjIquSiKoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkApW5hSeQzjQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEOBTsWn5X3pB0hta401DhV2MO9xIMA0GdqTLnuujAMqTOoDtFC1sdT+iD0m48MK0Wdfyz4jfnV+XfCh4pcCD8U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8452/idp/profile/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/nya-14.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-14.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 0fe25e9f..00000000
--- a/swamid-2.0/nya-14.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-14.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-14.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOf2TJJC9obLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIx
-MTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l1dyGmF/t6slbX9MkgpYBtHIHmrF68j
-IB1FeZdc4q553BkbV5KQBwu6n68ammk7Nz6OOwdOWmGJ6MX+2PjVVerdD3IT3M9t
-Ip9pfbEoMQAWu1FNMa2+PGIj8MSU5YG7QU2KFCt4HDB0NSr3VikR3ZTrF1DURX4N
-kqWzrMAJ82xSj4RkUR+9zgaAO+95Nh7zngCyvIm0/YDLIsCvYQCn2PaLdZdviAyi
-ttiLDo/P53vqt7bJmbaQQMk+PFp7BR9kRVL61Ckyjxe8b6CCvxe/NUXoXEcuMjz/
-kgfkvhhhM536Q6LvJmOIgGC67b1l58XSXajP2wbCnx3hI3B11N4E2QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRgjvTHIWqXb+/QKwVaWxL8
-G7xILzANBgkqhkiG9w0BAQUFAAOCAQEAj6RsTBwEL32xpcvUi23tCA+58rygz7i1
-zg9moyxkbswHrdumM9WtU2Ofp/ZhzDkyI3CK9srELMoXR3en8X2GPAIijEHSU5BK
-XIJNQo4odRPTw9eZhVdF427bptpIOiL555cQhsLFx1DduXXvUpLzeE7JRmPtwJY1
-fPzDX14r5J/yXBZyljlJfwBv+04D9RNcfMr9yNfga61h/nJzwlWqfdwdyvyi8ORM
-3k6oXPp98TbUscWVBPQ05imvyFwDIwIuFJu9NiwORXDqdELPRXCmV3YnhN9kSSEF
-nmOWiIiH9RKtRI4u5ypWzfu3S6XDcYrTiNeZeGyTB4v6bu74nFyzbA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-14.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOf2TJJC9obLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODUzWhcNMjAxMTIx
-MTIxODUzWjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l1dyGmF/t6slbX9MkgpYBtHIHmrF68j
-IB1FeZdc4q553BkbV5KQBwu6n68ammk7Nz6OOwdOWmGJ6MX+2PjVVerdD3IT3M9t
-Ip9pfbEoMQAWu1FNMa2+PGIj8MSU5YG7QU2KFCt4HDB0NSr3VikR3ZTrF1DURX4N
-kqWzrMAJ82xSj4RkUR+9zgaAO+95Nh7zngCyvIm0/YDLIsCvYQCn2PaLdZdviAyi
-ttiLDo/P53vqt7bJmbaQQMk+PFp7BR9kRVL61Ckyjxe8b6CCvxe/NUXoXEcuMjz/
-kgfkvhhhM536Q6LvJmOIgGC67b1l58XSXajP2wbCnx3hI3B11N4E2QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTQubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRgjvTHIWqXb+/QKwVaWxL8
-G7xILzANBgkqhkiG9w0BAQUFAAOCAQEAj6RsTBwEL32xpcvUi23tCA+58rygz7i1
-zg9moyxkbswHrdumM9WtU2Ofp/ZhzDkyI3CK9srELMoXR3en8X2GPAIijEHSU5BK
-XIJNQo4odRPTw9eZhVdF427bptpIOiL555cQhsLFx1DduXXvUpLzeE7JRmPtwJY1
-fPzDX14r5J/yXBZyljlJfwBv+04D9RNcfMr9yNfga61h/nJzwlWqfdwdyvyi8ORM
-3k6oXPp98TbUscWVBPQ05imvyFwDIwIuFJu9NiwORXDqdELPRXCmV3YnhN9kSSEF
-nmOWiIiH9RKtRI4u5ypWzfu3S6XDcYrTiNeZeGyTB4v6bu74nFyzbA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index a7343be9..00000000
--- a/swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANdvOCmSmyJRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODU0WhcNMjAxMTIxMTIxODU0WjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAObYpBsWnkmBYaOiXBA9LCdqIhv98KuIkpQEJHf1V0yV4uuPTd0vSAA/jFFujX8ijm6KkZQdNpTD5t8iFYNuCbsCAwEAAaN/MH0wHQYDVR0OBBYEFA98b3vQH4QfZyGflpm4zx3rS1OsME4GA1UdIwRHMEWAFA98b3vQH4QfZyGflpm4zx3rS1OsoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA1284KZKbIlEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/ECeeRCjEyum4Qnaw1PafRry/XHU6Ib/aueL320OS7p7YpBpKE5h2ge/GvlPxY5rhvilbR0YuQEvqFDipMFmQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-14.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANdvOCmSmyJRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODU0WhcNMjAxMTIxMTIxODU0WjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAObYpBsWnkmBYaOiXBA9LCdqIhv98KuIkpQEJHf1V0yV4uuPTd0vSAA/jFFujX8ijm6KkZQdNpTD5t8iFYNuCbsCAwEAAaN/MH0wHQYDVR0OBBYEFA98b3vQH4QfZyGflpm4zx3rS1OsME4GA1UdIwRHMEWAFA98b3vQH4QfZyGflpm4zx3rS1OsoSKkIDAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlggkA1284KZKbIlEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/ECeeRCjEyum4Qnaw1PafRry/XHU6Ib/aueL320OS7p7YpBpKE5h2ge/GvlPxY5rhvilbR0YuQEvqFDipMFmQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-15.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-15.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index bca0532b..00000000
--- a/swamid-2.0/nya-15.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-15.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-15.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-15.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-15.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAJ22nkci2o63MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDM5WhcNMjExMjEz
-MTQxNDM5WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq+quG3cBrY9nyqA9VLC7GzPSgrlsaOte
-LUyLZgqNzDHvkOhv/RJDPU5+gBzc5W+7aUN1/VP2SwwcQNUPNyLd4WBsT+MbiUMB
-CSX77jlMt31dgZC9bh++rq3MhQzz2MDkjOs+oqeMNDsfiicWkHytVeeQAD23BBR7
-OBJR9am+5E3pl+zKZPDXuadIlBAY/SUnoUpR3hGM5/ZWjxXNHQHmXXwlkQP/rsQ3
-BpmKTPFhgP3sTKHc5UryHMQnGd5gz9H9EnPf282lJYCYfTOlG5TkiJ/qjPGmO7G6
-KGtgpaAkQ8jU9LbhRdlRpdOQPg8NEyPpETIGNO13iaWkQ/dMUVqxmwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTUubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQi/d1F04lOt3rP9Lw5
-ESSmdbA7sjANBgkqhkiG9w0BAQUFAAOCAQEAQDYqHV36FsGMgLO/UJ4mepGW5L65
-TSouG/yP4n2DQTPAY+9Iqc+get9ZvuF2kd+w66W7awg+LYdbDZRDK+AEQwdJCL9s
-VWnfKH0Lp1KSM8xZ5Xx95wkAdGi/PEKJfDCAlRpEoMHGllm1jPftV0kGhAhSyqh1
-uNCxhVEdHcyvaelzf7cm0grfcFrJxl78M6C6eL3pQnG9dkIaKmUAA2cM771gIraO
-3Q10Iac3qT82DNrb0SUcWi0vLJURPmQ1SJP1xFJrF3Q8vE5pP4oDpCaOq0wqtQlA
-W0+9QcTj4ZQCjZo9d6upjsbAo/Pp6MGuOLAcRCqPt1QiE55EBnAisZmbxA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-15.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-15.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 5d740f2d..00000000
--- a/swamid-2.0/nya-15.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-15.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-15.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-15.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-15.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALn4W2JL5vSnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQzWhcNMjAxMTIx
-MTIxOTQzWjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxMxnfwGgIeMuyupdiyVfKTghCzVnbAxm
-8hzGC2U4Y7RDoG6hJwvOfhcbnrorPEr2L7CoPka2oRVsjeHCUqlYnRFTifg7Hilf
-22iKRK/8bCNdf2qeXglsSv8xXicE7G2lzH7FK9IHp7XwJXy8WCi4iRH2TFiRqxn7
-Y69MMMQGZ+yRA08CG9FC9GOF8yLFtjUw0ZmRU/fSkF6dNbkkFSd1mM4isXOP5ExO
-w0IuWR9mLxKMpBmTr0315VyfetwxhjFtWmOQ/CI9Gzs0NBJqvMnr77S9dFVSzGSm
-YhgnUCfqpZWSgYJVGyp7sF+FX1iWlxqgNigc64zescCWmnZWJuOj9wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTUubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSbTF5GYcraFbwx5rWpzU5Z
-uKzaczANBgkqhkiG9w0BAQUFAAOCAQEAF9RqbDxe3QUiGP0BgyXPdQxdOGFLh/Ew
-l5BxlCMBKFv42WihFYqVdxm1ASaDTeWjzeyWpnuyFtn2vg/JF3kvJqf87ZSNVzlm
-3ABZ9ktPsYwiY72d2VNaiZa4fXuJygXd1aUu8njF44Bnz8HkqFIczxH5iD04fIwP
-bu2IjjBBzFIhSb6JX8PspuEYIrDfX6L/SwDUaAyT+VkP1cHbwcz0oW19WnXL+OWw
-blX3nKB5ALKFaDwOBgSsoQ2FFmxfcp5aq+/cX4uEvZ7lpSW1Fx3Xnn/4TgCkuBZ+
-6PVa2ubYSOkVCQWoZ5EOrBkTkG2GP4wkvnsuugvdXQJzv5VPn+zNLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-15.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-15.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-15.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALn4W2JL5vSnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQzWhcNMjAxMTIx
-MTIxOTQzWjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxMxnfwGgIeMuyupdiyVfKTghCzVnbAxm
-8hzGC2U4Y7RDoG6hJwvOfhcbnrorPEr2L7CoPka2oRVsjeHCUqlYnRFTifg7Hilf
-22iKRK/8bCNdf2qeXglsSv8xXicE7G2lzH7FK9IHp7XwJXy8WCi4iRH2TFiRqxn7
-Y69MMMQGZ+yRA08CG9FC9GOF8yLFtjUw0ZmRU/fSkF6dNbkkFSd1mM4isXOP5ExO
-w0IuWR9mLxKMpBmTr0315VyfetwxhjFtWmOQ/CI9Gzs0NBJqvMnr77S9dFVSzGSm
-YhgnUCfqpZWSgYJVGyp7sF+FX1iWlxqgNigc64zescCWmnZWJuOj9wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTUubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSbTF5GYcraFbwx5rWpzU5Z
-uKzaczANBgkqhkiG9w0BAQUFAAOCAQEAF9RqbDxe3QUiGP0BgyXPdQxdOGFLh/Ew
-l5BxlCMBKFv42WihFYqVdxm1ASaDTeWjzeyWpnuyFtn2vg/JF3kvJqf87ZSNVzlm
-3ABZ9ktPsYwiY72d2VNaiZa4fXuJygXd1aUu8njF44Bnz8HkqFIczxH5iD04fIwP
-bu2IjjBBzFIhSb6JX8PspuEYIrDfX6L/SwDUaAyT+VkP1cHbwcz0oW19WnXL+OWw
-blX3nKB5ALKFaDwOBgSsoQ2FFmxfcp5aq+/cX4uEvZ7lpSW1Fx3Xnn/4TgCkuBZ+
-6PVa2ubYSOkVCQWoZ5EOrBkTkG2GP4wkvnsuugvdXQJzv5VPn+zNLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-15.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index e5ea07a4..00000000
--- a/swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ5EIPWZsBq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ1WhcNMjAxMTIxMTIxOTQ1WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOPtej8GOoZ5sh1H5+prjFJWuIqshuppbewtJgnJvkU3/2LEiCc5QCOd2ikErB2qBH91gMH5YwPKe5CWhJz10kkCAwEAAaN/MH0wHQYDVR0OBBYEFOicqHOLp4Pu1kpz1mAY6JErEevLME4GA1UdIwRHMEWAFOicqHOLp4Pu1kpz1mAY6JErEevLoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAnkQg9ZmwGrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGTajMoPPmg1kasLdpiMT318hDSbgED/rQ4oL8hK8EezdPk5qDLFBj+nC6M2IaV+ooBwkjlQClL8nfWaTJVYvoI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-15.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ5EIPWZsBq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ1WhcNMjAxMTIxMTIxOTQ1WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOPtej8GOoZ5sh1H5+prjFJWuIqshuppbewtJgnJvkU3/2LEiCc5QCOd2ikErB2qBH91gMH5YwPKe5CWhJz10kkCAwEAAaN/MH0wHQYDVR0OBBYEFOicqHOLp4Pu1kpz1mAY6JErEevLME4GA1UdIwRHMEWAFOicqHOLp4Pu1kpz1mAY6JErEevLoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAnkQg9ZmwGrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGTajMoPPmg1kasLdpiMT318hDSbgED/rQ4oL8hK8EezdPk5qDLFBj+nC6M2IaV+ooBwkjlQClL8nfWaTJVYvoI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index f353ac61..00000000
--- a/swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL39oDbalwq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANADC2tewqf0MKGtvObf8peBvzLuf2gzL4420IUXySOdRXYc4Aplrngsp6bS4GtTlNt5/LQiuqd+nOtKUaE+Tl8CAwEAAaN/MH0wHQYDVR0OBBYEFMjIA5ygeyXCMWYvcxxHOvWTNu5qME4GA1UdIwRHMEWAFMjIA5ygeyXCMWYvcxxHOvWTNu5qoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAvf2gNtqXCrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGy1bmQP4Z1GVxmVjOiArQE/81K1Z6sotYQ8uE4LZpPDjeO8yQ/fdo4ErhyaerkMhDfzLdZMgxOE7a4GiY7VzH0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-15.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAL39oDbalwq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANADC2tewqf0MKGtvObf8peBvzLuf2gzL4420IUXySOdRXYc4Aplrngsp6bS4GtTlNt5/LQiuqd+nOtKUaE+Tl8CAwEAAaN/MH0wHQYDVR0OBBYEFMjIA5ygeyXCMWYvcxxHOvWTNu5qME4GA1UdIwRHMEWAFMjIA5ygeyXCMWYvcxxHOvWTNu5qoSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkAvf2gNtqXCrgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGy1bmQP4Z1GVxmVjOiArQE/81K1Z6sotYQ8uE4LZpPDjeO8yQ/fdo4ErhyaerkMhDfzLdZMgxOE7a4GiY7VzH0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8452/idp/profile/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/nya-15.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-15.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index eada0c9a..00000000
--- a/swamid-2.0/nya-15.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-15.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-15.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-15.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-15.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMpILSDrs6yUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ0WhcNMjAxMTIx
-MTIxOTQ0WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr5Yun3UHfKTLwp1eS7vSwz/lDOYLDGe9
-yda9EOgQ5uBRCOJP5M0U6dSZKNZ4wzRfPMa4iZhBIALBCT0Red0FicqnwHGKM1Mg
-D0XBwZ1PCGCnYei98FBVcgLYJj05vtKDGglUVA0kg8X8G7Wmng9mwL0O7EaPdKyZ
-yQy44aDIROYMb+7BdtjNzLqxgPLjustFwQb2LSDUoIXjvu6hQmIzSR/1ZMBQ6ToW
-Enj3DfxCVt60EUnZJPo2cJoQfpmRSCCaDkEopgY+ZWzoxDdhAdSV+IrL9ChhbnB/
-2Sxq8FvfAdnzlp1YRF7K5/VgFF8R2O6tm+WER+N0CfbNvQ6r2lEQuQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTUubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTOzhqwn7sKv9fJSWaob0v7
-Ql9+oDANBgkqhkiG9w0BAQUFAAOCAQEAVGYMhOOyHUwdaSEx1vjJlV2smPJwebOt
-9ZSoDN+Z9yq/ioQszzEf4kWSzG/U/H3u+KIJg5of61Tz12pft/WJZhX9k1Q4jx8R
-qI1L0jfb40ya91ZjLQ8/8SAhaNe757gDExjqshksKakIaNytk+gORDKJmA5rB80e
-o4veercsU6PnWTLvjqZsmjPV27oh2s/NuqV1jRljlDv4XAhG9WYjirzx0vBlyxwu
-9FrkTfFYtbJrzkTf0cN4Il6D2+hln1FU5WlZ6ERce/nBBqz8CGHcU+MyFLCjnlXj
-LvKOxIWSVyp4rJKk+olbaIS8f9RNriNbnEXCWJSRHpUOHWiUgWCu7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-15.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-15.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-15.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMpILSDrs6yUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ0WhcNMjAxMTIx
-MTIxOTQ0WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr5Yun3UHfKTLwp1eS7vSwz/lDOYLDGe9
-yda9EOgQ5uBRCOJP5M0U6dSZKNZ4wzRfPMa4iZhBIALBCT0Red0FicqnwHGKM1Mg
-D0XBwZ1PCGCnYei98FBVcgLYJj05vtKDGglUVA0kg8X8G7Wmng9mwL0O7EaPdKyZ
-yQy44aDIROYMb+7BdtjNzLqxgPLjustFwQb2LSDUoIXjvu6hQmIzSR/1ZMBQ6ToW
-Enj3DfxCVt60EUnZJPo2cJoQfpmRSCCaDkEopgY+ZWzoxDdhAdSV+IrL9ChhbnB/
-2Sxq8FvfAdnzlp1YRF7K5/VgFF8R2O6tm+WER+N0CfbNvQ6r2lEQuQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTUubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTOzhqwn7sKv9fJSWaob0v7
-Ql9+oDANBgkqhkiG9w0BAQUFAAOCAQEAVGYMhOOyHUwdaSEx1vjJlV2smPJwebOt
-9ZSoDN+Z9yq/ioQszzEf4kWSzG/U/H3u+KIJg5of61Tz12pft/WJZhX9k1Q4jx8R
-qI1L0jfb40ya91ZjLQ8/8SAhaNe757gDExjqshksKakIaNytk+gORDKJmA5rB80e
-o4veercsU6PnWTLvjqZsmjPV27oh2s/NuqV1jRljlDv4XAhG9WYjirzx0vBlyxwu
-9FrkTfFYtbJrzkTf0cN4Il6D2+hln1FU5WlZ6ERce/nBBqz8CGHcU+MyFLCjnlXj
-LvKOxIWSVyp4rJKk+olbaIS8f9RNriNbnEXCWJSRHpUOHWiUgWCu7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-15.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 919a3d48..00000000
--- a/swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP6Q22y7RrN3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ2WhcNMjAxMTIxMTIxOTQ2WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK91f1aF8kYYjrGZe5AIRqqsN54fUQmSX/knl0Nru30OoeVmtBgPVMrWarRUswdQJY0bDLHofOvwfEJScHOuNnkCAwEAAaN/MH0wHQYDVR0OBBYEFOw9ls1EMGTRho6Z3dBMEM7sJ9q9ME4GA1UdIwRHMEWAFOw9ls1EMGTRho6Z3dBMEM7sJ9q9oSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkA/pDbbLtGs3cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGZC8QrUQs+MrjJ6U77AStlzBGgvgBG395Y2tQx4s6yr8vGJUUbfmVfojjqKqTOnhDQsX+IkZ3Pijv3drTkvLAc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-15.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP6Q22y7RrN3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxOTQ2WhcNMjAxMTIxMTIxOTQ2WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK91f1aF8kYYjrGZe5AIRqqsN54fUQmSX/knl0Nru30OoeVmtBgPVMrWarRUswdQJY0bDLHofOvwfEJScHOuNnkCAwEAAaN/MH0wHQYDVR0OBBYEFOw9ls1EMGTRho6Z3dBMEM7sJ9q9ME4GA1UdIwRHMEWAFOw9ls1EMGTRho6Z3dBMEM7sJ9q9oSKkIDAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlggkA/pDbbLtGs3cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGZC8QrUQs+MrjJ6U77AStlzBGgvgBG395Y2tQx4s6yr8vGJUUbfmVfojjqKqTOnhDQsX+IkZ3Pijv3drTkvLAc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-16.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-16.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 83bbd9b1..00000000
--- a/swamid-2.0/nya-16.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-16.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJANFMbjKxaUnLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDQzWhcNMjExMjEz
-MTQxNDQzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2j1lXZX9rDadqcF6ibJjSMITgM3e2Us
-feEfaBmsfaIVknwkxdyZv4uROqZHd9png2MfRG02/JdeVXgbUdEOo45CO764ohsF
-uMDiu1FQDuPrlTVnDpu8cGzG4bq8PhqXdfMqB8dXnLgpW4/4dVGTQ0qzbKWyiXmq
-EwGkM2YdCV9kwcGhw4oAmcgw4XsN8sUqg9DFoEAeoLQoXGguBjQsLU67wDwiNQWO
-XfMV0nPga6mP6xEH8uMHqGYQzS00diCNc+WGstDuhrjmt3YC0wb9N/8hB3yGV8sl
-Gaw37P1J2VfoEV+77VfOGMe666sbk/kBbpZwQKbU2cl0mEvMmyQ5OQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTYubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSgPT7q0ocvrotkuGTH
-1j7y7K8RhDANBgkqhkiG9w0BAQUFAAOCAQEAfelpyu3JwSk4WmzfdPHxAzMQaoWF
-fx1T9T75EMiJiujMEk6J0GRvGX2OgRobQ6582tqBYiQutedpzlJOJriAYZoE1jxo
-74XsBo3MBI/x2cGt7CF2Cui/UepbIJiSkpmSbRAC2eVwJmEVkwjsshhtS4fDjuQE
-vdPgA3hDRl6QzuElgt3dPJfvGWwyreaijyw8m6IjYNA2ke66XIsA7mGrz7HoGK42
-Ed4TZ+AxBdNjC0mnFd5mWYE6rPfYbSHZ4R8PTtmUtSRGbjtld5bQY7R17XJT0V/v
-MEA25rcxC6D2hDL+ZQf5oi+nGHJ1PH9Qm+R9FhZRYjtAiMEy3ZKlyTDizw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 3a135d48..00000000
--- a/swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-16.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
-MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
-X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
-OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
-WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
-8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
-1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
-SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
-T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
-wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
-E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
-b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
-jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-16.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
-MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
-X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
-OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
-WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
-8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
-1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
-SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
-T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
-wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
-E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
-b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
-jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 8a691478..00000000
--- a/swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-16.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index d1e5538e..00000000
--- a/swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIGeNY16cTPJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANIEbjIpI2I3/FTTZKnLB0GzRxZ+mBkDRwi9V+fYsB+8+AoUid0sr4xjBbKPfZDEXlpECURqozI/SKX2v1YPKeMCAwEAAaN/MH0wHQYDVR0OBBYEFIC1A6zR9zW9llh7OCLrhlLUOCydME4GA1UdIwRHMEWAFIC1A6zR9zW9llh7OCLrhlLUOCydoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAgZ41jXpxM8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT8Ea90tBi8eLdf69F9b5LLf0yXrb72eun/wO5MXR+z0/tS8Xzo8t+M8uc1cWey1uXSYdQEV3YzxquM4WydlIo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-16.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAIGeNY16cTPJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQwWhcNMjIwOTE4MTczODQwWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANIEbjIpI2I3/FTTZKnLB0GzRxZ+mBkDRwi9V+fYsB+8+AoUid0sr4xjBbKPfZDEXlpECURqozI/SKX2v1YPKeMCAwEAAaN/MH0wHQYDVR0OBBYEFIC1A6zR9zW9llh7OCLrhlLUOCydME4GA1UdIwRHMEWAFIC1A6zR9zW9llh7OCLrhlLUOCydoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAgZ41jXpxM8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT8Ea90tBi8eLdf69F9b5LLf0yXrb72eun/wO5MXR+z0/tS8Xzo8t+M8uc1cWey1uXSYdQEV3YzxquM4WydlIo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8452/idp/profile/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/nya-16.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-16.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index f8782ec6..00000000
--- a/swamid-2.0/nya-16.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-16.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANOmErsQrSNvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4
-MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDBfmRg3HpFoqMzXVqrpkmYyMEoo93hx
-URtfL02+Eo27r5lvBI73iFbIr8Y2z0vTEEc4cx2nC0jA9BSA65XCNi3KxwchDRWv
-DufnsOJoD+ImQyujhSWmFq7cnwRmrE1THAmn2Gn+Ktps0Tlbe4XxYi67kqQhiGW9
-vdBqispl9MpCG/9Ebd6+m4DvHdBhlWmjADlIdk8l7hudUGaQ0a5tn0s/w2ODLqZt
-LYGFikFh5CUbf3Tk9hRxQ3iRFfbia+JJ+YC18f/DptaQ+9DWjB7dvRGWdkK/85oK
-xNZwFN1l0r982M04BiYoVcZdf+O0lH2A7Lnn39mx6UEVJ0IvAxv/ZwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTWuGMofab2XeGnO494wJzC
-2SQ9STANBgkqhkiG9w0BAQUFAAOCAQEAShUMdXqpSmdOg+WZDUPONMKagJmr/cmh
-rH0/f+iRDwWIjtTLfkE9CQ2ID/LQ4pMGkD0gPQynTWgTNK3+Chua2zfpg1vx2EV3
-M7vSJSheHPN+HKPnkkt1n3numAzLvDkUt98XXnUrwu0+MdHYTkE3fmcs2W0WNWIz
-9m4X2ZohniblG15LsaP5nmDHceDlmfg2Sq2FAsrZgl6zvCU1UUMxLnABdjTBw8QQ
-v5vgi77VvlDJlZEWKbbpQtVVNuDfoTrd+dw5zrPJliFdHkzIkMNoBggwEttO849r
-zqyiUXEA9xCj9ihZQenCbh7FZHXbp7fvA07EwU180jWHm8gh3XUDjA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-16.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANOmErsQrSNvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4
-MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDBfmRg3HpFoqMzXVqrpkmYyMEoo93hx
-URtfL02+Eo27r5lvBI73iFbIr8Y2z0vTEEc4cx2nC0jA9BSA65XCNi3KxwchDRWv
-DufnsOJoD+ImQyujhSWmFq7cnwRmrE1THAmn2Gn+Ktps0Tlbe4XxYi67kqQhiGW9
-vdBqispl9MpCG/9Ebd6+m4DvHdBhlWmjADlIdk8l7hudUGaQ0a5tn0s/w2ODLqZt
-LYGFikFh5CUbf3Tk9hRxQ3iRFfbia+JJ+YC18f/DptaQ+9DWjB7dvRGWdkK/85oK
-xNZwFN1l0r982M04BiYoVcZdf+O0lH2A7Lnn39mx6UEVJ0IvAxv/ZwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTWuGMofab2XeGnO494wJzC
-2SQ9STANBgkqhkiG9w0BAQUFAAOCAQEAShUMdXqpSmdOg+WZDUPONMKagJmr/cmh
-rH0/f+iRDwWIjtTLfkE9CQ2ID/LQ4pMGkD0gPQynTWgTNK3+Chua2zfpg1vx2EV3
-M7vSJSheHPN+HKPnkkt1n3numAzLvDkUt98XXnUrwu0+MdHYTkE3fmcs2W0WNWIz
-9m4X2ZohniblG15LsaP5nmDHceDlmfg2Sq2FAsrZgl6zvCU1UUMxLnABdjTBw8QQ
-v5vgi77VvlDJlZEWKbbpQtVVNuDfoTrd+dw5zrPJliFdHkzIkMNoBggwEttO849r
-zqyiUXEA9xCj9ihZQenCbh7FZHXbp7fvA07EwU180jWHm8gh3XUDjA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 009efc5d..00000000
--- a/swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-16.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-16.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-17.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-17.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index d58f7ae2..00000000
--- a/swamid-2.0/nya-17.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-17.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOsxrcoHLjS9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDQ2WhcNMjExMjEz
-MTQxNDQ2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQ23FTBIKH2USIVYfwKJYR/HGiU3Nl36
-YfhYfMZsbCMpC0m2ViLtwk/N2XJLHDJw112ZqSITmVFHwdDMbpMLZtdeyocCytvT
-+nBx3EaBYdoILZn5aJI9z5w5SA0XM59BD1ubtzYcoPAr9YKRuHI5F8uJOv36pmOR
-jSOYeMfTb5hTdL/wuOm/v3PPi1a4wTRQgFQkxxPTEtHrTMmSAvu31ykRgeWvOzI/
-K+wrXamK2gEfgRMQ0RCj5TlP2g4eCApol9GlKyjjDheCc40IfczEOArOk4gzF5TM
-8rVYuRykXvxkI8koocSB8V2WJmZRoypHFnmTjM64zTi/XvrwEN04zwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTcubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTHg+HkideDNZdO/hpu
-9242wuvQ+DANBgkqhkiG9w0BAQUFAAOCAQEAQlyj1+dVmy1kjsg9csb5Ur4kSdWc
-at7kQMSHyrKNHr01fOf+qiw/7YrEq9b5tR0Gp58hwASRCYvFa4B0cA+WInDndDa/
-6E1IiUGt/VS1CDM29qsidxNx9eUxPivFRjmWUD20LBS5EwtiifAoUc24RmPGAQ+o
-FiSDh+u3UZzaHhe8DfY8VcCw2sTO9LuK2PEI/nKR2Nda7+M+sy6odaPJdkGh6zJi
-QVXzC7sMf52hVktgFLtvKRUetQl4+M4xSgvnPm9Ub+ey7gBkxgUmdxGokRfqyYmV
-kcHeJzjoVblztcwxiC7gCrQIPdClYGG3O2ID8UyVskpag7HyqFhy3lYthw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index a4758fe2..00000000
--- a/swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
-MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
-1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
-AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
-2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
-lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
-MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
-2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
-1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
-CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
-HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
-z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
-mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
-MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
-1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
-AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
-2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
-lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
-MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
-2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
-1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
-CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
-HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
-z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
-mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index f168e065..00000000
--- a/swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-17.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index e316d6d2..00000000
--- a/swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI7Pd+S0tTRLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKwDdTxqmyNhI8hiu2wuwtRCtiCUrDARPNXRuxoCFM0k5L50sshxUbUskPc9r4hiQVldmhjsSuJa0SrJd7HnJZ0CAwEAAaN/MH0wHQYDVR0OBBYEFMM4b+D1TbPEhbmFwunrbBqyN3vuME4GA1UdIwRHMEWAFMM4b+D1TbPEhbmFwunrbBqyN3vuoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAjs935LS1NEswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIWC10wW8jdqIE13v7DGnHdJpnGa7HL1P4aG2+RqJ5nwOcfI8UP+Nm158hzEKujw93zjkXkeJbPIMZdUPTnmNA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-17.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAI7Pd+S0tTRLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKwDdTxqmyNhI8hiu2wuwtRCtiCUrDARPNXRuxoCFM0k5L50sshxUbUskPc9r4hiQVldmhjsSuJa0SrJd7HnJZ0CAwEAAaN/MH0wHQYDVR0OBBYEFMM4b+D1TbPEhbmFwunrbBqyN3vuME4GA1UdIwRHMEWAFMM4b+D1TbPEhbmFwunrbBqyN3vuoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAjs935LS1NEswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKIWC10wW8jdqIE13v7DGnHdJpnGa7HL1P4aG2+RqJ5nwOcfI8UP+Nm158hzEKujw93zjkXkeJbPIMZdUPTnmNA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8452/idp/profile/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/nya-17.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-17.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 90fd8073..00000000
--- a/swamid-2.0/nya-17.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-17.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
-MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
-YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
-0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
-bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
-yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
-DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
-ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
-ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
-Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
-x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
-gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
-ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-17.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
-MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
-YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
-0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
-bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
-yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
-DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
-ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
-ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
-Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
-x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
-gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
-ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index eeb72f8a..00000000
--- a/swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-17.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-17.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-18.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-18.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index cbdd7e9c..00000000
--- a/swamid-2.0/nya-18.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-18.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAJJ4j+PgG8rFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDUwWhcNMjExMjEz
-MTQxNDUwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2B/uy5BIrLT+JDYCFZ6GgQwJEKnwSvK
-1w0cVP36afwiOJL7xJ1whf0Y/zT5il50j6MAiB/yYyG50bOwKIAxSpKSb5b0CkpF
-7S8wWZ/BcJZa5JlKqeFf+RRY6wfNpw1tpaLO+bYzxVLsdAULoDvU+sGzyBsp9sI0
-a3gJRB7AIaDIW7QY0chLVtT+n6YIKk9u4iSWFX54PvC4hU6m4bUN8a5I4pL4cKXy
-fJQ1hm9y1fSiIhpptiZuNnwYcgyu8euBiJWq4daGLKeKdI6VhWD5AJitqHYzxOho
-7ZKZyiOuC72D0qr7DpSNQ43W5Vf0Ypaexd3BANBlMxnVJcE9EX8/DQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTgubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRc3bgjSEwFTZzgoZES
-Jh5ijBurOzANBgkqhkiG9w0BAQUFAAOCAQEALnlnmfHTn9FfaWbe3YITt4yyMs1P
-Ae7Abd4ZqMmpdeUcsEBEZjiKUs/g6/JqKA4E0YGtzOEJkjxNfGdYlAjhM0d8dbCh
-aC5uJ0uwEMsbZtG91V+RBfUkFU1P6cGjA4voaqJeQf2EKu3qy8dFKU3YJKBAe1NL
-Vyh7zdOzwHfcmQqMc+EJRwaWgeNJqrBgFeExukmQ+uMj99ODI6JveSUTCZqFrJLe
-tkfn859TpDNdCXzoe2MysuwNL4IyZJPP92rLC7vjVe/DU5OkeX6QmPAJaio3Wo/1
-A6GkvQRQ+zMPxxZ8Jzq2pUpmZDR8IPAz2457UJP8N4Wa3PuH3HsKi5OilQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-18.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-18.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 68ee487c..00000000
--- a/swamid-2.0/nya-18.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-18.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANz6xPrAunzRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEwWhcNMjEwMjA4
-MDYzMDEwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApStBOynWq4AwKzRApwYwzum1gGTYVr6X
-qSEazkKnNz7SBTENvAyMxylFiqE+E0xSJQ2fUNKkFo8iQNyW3CDOGKiEKfDm8wU8
-2Eo5QiiuTKvrJslKYpl+WVxa1SsfvxFAFPO1K7iwVqtuhMhhL9HAHG9RpsXXs9il
-JelBXtJtJQPfe1GnO9UyfivZ66bIRZBAWfGNLRGOYrZYkos8MJ02omIvFm2cttwu
-PuorkGevfBtPebCpX2dGIKkncc2KDY80CCBfi0llp9hKhYQZBRCMBl9h5mNH5Z5S
-pCDwKkRtYZ7Jxmi8rD7A7IwcGIng/OYxNp8d7nU010h/dN6Cj2f+jQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTnSFx9KUha74KSSQCsVtFg
-1z7fpjANBgkqhkiG9w0BAQUFAAOCAQEAlYc1tIA8bQVXREw8LRRfgVIGJFfgcciU
-tcVW+e2zEt0DT/f69nPqO9EGyate2+QiQeEsEDlVXuymjAUED5fJu5WNdysoF2SQ
-dvZ+oAMaW++bF2RPnKbUYT7iQXZnDhIvneFgeZoGhC+JiB3bhNuTs11ObRshXLC0
-pmOsKdRVNVK4IrJmt04Y1BBCzrQefjAcXMCmCpi7KeCY/pJLtWN8/RDSjbPEZYbe
-Ou+/c3n9AC9RwrLCz3jJXNuind05rW4pl//OFTitGTMkogYHxp0lDqA+AHb+HnCY
-9DDP/KdVkLuF0vN9jrBfoU9txTml0vqTfylynfdj0HzjKhJPeBOH5A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-18.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANz6xPrAunzRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEwWhcNMjEwMjA4
-MDYzMDEwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApStBOynWq4AwKzRApwYwzum1gGTYVr6X
-qSEazkKnNz7SBTENvAyMxylFiqE+E0xSJQ2fUNKkFo8iQNyW3CDOGKiEKfDm8wU8
-2Eo5QiiuTKvrJslKYpl+WVxa1SsfvxFAFPO1K7iwVqtuhMhhL9HAHG9RpsXXs9il
-JelBXtJtJQPfe1GnO9UyfivZ66bIRZBAWfGNLRGOYrZYkos8MJ02omIvFm2cttwu
-PuorkGevfBtPebCpX2dGIKkncc2KDY80CCBfi0llp9hKhYQZBRCMBl9h5mNH5Z5S
-pCDwKkRtYZ7Jxmi8rD7A7IwcGIng/OYxNp8d7nU010h/dN6Cj2f+jQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTnSFx9KUha74KSSQCsVtFg
-1z7fpjANBgkqhkiG9w0BAQUFAAOCAQEAlYc1tIA8bQVXREw8LRRfgVIGJFfgcciU
-tcVW+e2zEt0DT/f69nPqO9EGyate2+QiQeEsEDlVXuymjAUED5fJu5WNdysoF2SQ
-dvZ+oAMaW++bF2RPnKbUYT7iQXZnDhIvneFgeZoGhC+JiB3bhNuTs11ObRshXLC0
-pmOsKdRVNVK4IrJmt04Y1BBCzrQefjAcXMCmCpi7KeCY/pJLtWN8/RDSjbPEZYbe
-Ou+/c3n9AC9RwrLCz3jJXNuind05rW4pl//OFTitGTMkogYHxp0lDqA+AHb+HnCY
-9DDP/KdVkLuF0vN9jrBfoU9txTml0vqTfylynfdj0HzjKhJPeBOH5A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 098f7092..00000000
--- a/swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-18.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index de4e0ca0..00000000
--- a/swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOoHdLociEfQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALuqPVIVu+lej+2bTpk/uS49yNJHgVbKKkNM+xIyVXmaiggCf7PaAajlJcp3C/AQlJCPrV4FODCgprd6PLhY2UECAwEAAaN/MH0wHQYDVR0OBBYEFJloM666Z1IlsDZMLRpD807gg1HgME4GA1UdIwRHMEWAFJloM666Z1IlsDZMLRpD807gg1HgoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA6gd0uhyIR9AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKHwjxQjgsIiGkGKh+Vtjp4srJIEACl8ZQfopqAGySuovZYV/ZdFmu04fhRaMtzHDLLTB1F6dOQZp6NCeuLedbI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-18.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAOoHdLociEfQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALuqPVIVu+lej+2bTpk/uS49yNJHgVbKKkNM+xIyVXmaiggCf7PaAajlJcp3C/AQlJCPrV4FODCgprd6PLhY2UECAwEAAaN/MH0wHQYDVR0OBBYEFJloM666Z1IlsDZMLRpD807gg1HgME4GA1UdIwRHMEWAFJloM666Z1IlsDZMLRpD807gg1HgoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA6gd0uhyIR9AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKHwjxQjgsIiGkGKh+Vtjp4srJIEACl8ZQfopqAGySuovZYV/ZdFmu04fhRaMtzHDLLTB1F6dOQZp6NCeuLedbI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8452/idp/profile/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/nya-18.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-18.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 23727b2e..00000000
--- a/swamid-2.0/nya-18.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-18.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
-MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
-YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
-hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
-QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
-qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
-M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
-UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
-FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
-464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
-KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
-kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
-hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-18.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
-MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
-YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
-hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
-QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
-qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
-M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
-UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
-FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
-464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
-KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
-kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
-hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index f3e21ad9..00000000
--- a/swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-18.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-18.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index b3ae0124..00000000
--- a/swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-19.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAL+66TyFwTytMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDUzWhcNMjExMjEz
-MTQxNDUzWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Jpp6y7+IX46QINFv1yM3XpY6Q0NGIh4
-PImfGX96kX8pVaAtnztN3J6/8hK+gkMQ7/wpQbzEE9OkmDSKk7mFaGEYCiRyXMBw
-+3f8OmJRUGDemIg2uxoArrQcwfFSXdwBDViPQisI3mqTuyXRSGB6YTwQ3GSvggI4
-hydbhjWELgwy/whG3W9UyTaVCv0bzw6dQK/oxFa5anfniaWYcFHvTZ+PNq+hQYdJ
-CxP49b/DU+1m9WFQnHeuj+FjfhmozvfoI4SgvbkbPDD6+7/DIiMH/fGuNf68tkZs
-mjqM/UMbvdmh2aED/BJKiGgZW34ygPWhACi31bvRhMtp9C5u8Dij/wIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMTkubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTZjzKQmCndYt1ty75V
-viGkn28MKjANBgkqhkiG9w0BAQUFAAOCAQEAhzEoD72gUG5T44P8XMO1ofBvcmnX
-eh8S2fK6v01UR2DcdnPNHamG9ln1wPqYKEX4FNpzBlrYamXgYcyoDDOiy1D0j14k
-aiymQ3N0QdpgIu5qM6J/ClkiSRgRnjNgdNkiasMXcG+brrAN166IeK+jT43NqhiV
-vZE9YvwNZPhZC8F9us/n96cMz7lW7cvwYgFQVEwlEP7zdnkk0HeopMxVUILL7nl0
-xT357BkGKeaFoFJIqXRGubefLB5rQw//6ijvOkT+qU05LfIn/DEv8aI6QClSUNpA
-76yifJ9yA+mlhfxPNSwX7CTQ+NgJdI8PndjhTbcxKjx3huoVcD54cp4SHw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 0cbe8a09..00000000
--- a/swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-19.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
-XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
-Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
-xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
-p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
-m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
-lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
-pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
-iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
-bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
-b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
-MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-19.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
-XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
-Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
-xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
-p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
-m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
-lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
-pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
-iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
-bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
-b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
-MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 9ca6263a..00000000
--- a/swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-19.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index a7c8e21d..00000000
--- a/swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKouruINQwf0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL34WFtl1f6VVwSvSFw0BtbEsLkBgXQgtNVO/glg6czCxBiQg5ZQGC5qQJP68K0dEBkGTanvk4yrdIzzarypMvkCAwEAAaN/MH0wHQYDVR0OBBYEFAe8cQCxX6qX4KG6QJODBBGATqo5ME4GA1UdIwRHMEWAFAe8cQCxX6qX4KG6QJODBBGATqo5oSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAqi6u4g1DB/QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFJB/xHAnvv1MchA0YQdHEdb+kjl84ADXX8mBRb0EM6G4jvs1s3DKR8W74hOBxwhpe2jm6mSyHm1q/Uv3c7Cick=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-19.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAKouruINQwf0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL34WFtl1f6VVwSvSFw0BtbEsLkBgXQgtNVO/glg6czCxBiQg5ZQGC5qQJP68K0dEBkGTanvk4yrdIzzarypMvkCAwEAAaN/MH0wHQYDVR0OBBYEFAe8cQCxX6qX4KG6QJODBBGATqo5ME4GA1UdIwRHMEWAFAe8cQCxX6qX4KG6QJODBBGATqo5oSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAqi6u4g1DB/QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFJB/xHAnvv1MchA0YQdHEdb+kjl84ADXX8mBRb0EM6G4jvs1s3DKR8W74hOBxwhpe2jm6mSyHm1q/Uv3c7Cick=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8452/idp/profile/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/nya-19.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-19.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 2c5b1277..00000000
--- a/swamid-2.0/nya-19.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-19.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIDWO/6B6u57MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DJr7QcgRpXhmvJEU7MXQzUbneHaepZ/
-1TBOjSKJx55cGLKiw75RfMLla/mEp4FUUArB7oUCUzr7h46/icFLO04JSWj/QGCS
-v938sBcb4ptvErYg5/OkFoGtprX0Frc3xUDjgPHLynIl/avZt4gSEgawg2mBCcXx
-PNah6oEFofX5TuwV5iWvS4xY4wv+E/PcK2wzXVjFnFPWwkR3dTZ6qy31/54na8kL
-f9OAc5nSs9Z/Z9Gf/r5ScTPTKFe9l8J1wOy3HCw9NTzrtMNxBS8En4syqBMmrL8g
-gns1mkI7Zd7JJC+NgyCBrT7BEuA7/tWTXeCZzzscqYhzV5EDpMjVHQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQB+2r7gWrBIhYpquUK1s8X
-72GGVDANBgkqhkiG9w0BAQUFAAOCAQEAVkYPmsdJY5AAR4ajBmCXhvk11Z7GRVnR
-E4yInboU0ZnBsR7cRY1/jleHmvkbOgaqWHAbnRCayHAszf4TDyqHcZLyp1v6zJ3T
-YdE+K7KNLQLhFsRQ6KWxawzxeaj88rN7QPP84db0V03M6w9gGvyZd3Brap2KCSCF
-Tly3nfEm6uWES0FuTJw5SIxfWDt0x3mvB9gDJdRjvBErGu5da/wrWfgQgY89aZq+
-MpGfOeGpoYdbwNxX+Bq/VuJB6YDCuvr68QnWqcLckCL33y0NZoGuTPoyq5eHpeda
-ER8Sto215PlOqQD1NUyzztZjub+spTzXkUffuJJTqFvoNl8BW8EoiA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-19.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIDWO/6B6u57MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
-MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DJr7QcgRpXhmvJEU7MXQzUbneHaepZ/
-1TBOjSKJx55cGLKiw75RfMLla/mEp4FUUArB7oUCUzr7h46/icFLO04JSWj/QGCS
-v938sBcb4ptvErYg5/OkFoGtprX0Frc3xUDjgPHLynIl/avZt4gSEgawg2mBCcXx
-PNah6oEFofX5TuwV5iWvS4xY4wv+E/PcK2wzXVjFnFPWwkR3dTZ6qy31/54na8kL
-f9OAc5nSs9Z/Z9Gf/r5ScTPTKFe9l8J1wOy3HCw9NTzrtMNxBS8En4syqBMmrL8g
-gns1mkI7Zd7JJC+NgyCBrT7BEuA7/tWTXeCZzzscqYhzV5EDpMjVHQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQB+2r7gWrBIhYpquUK1s8X
-72GGVDANBgkqhkiG9w0BAQUFAAOCAQEAVkYPmsdJY5AAR4ajBmCXhvk11Z7GRVnR
-E4yInboU0ZnBsR7cRY1/jleHmvkbOgaqWHAbnRCayHAszf4TDyqHcZLyp1v6zJ3T
-YdE+K7KNLQLhFsRQ6KWxawzxeaj88rN7QPP84db0V03M6w9gGvyZd3Brap2KCSCF
-Tly3nfEm6uWES0FuTJw5SIxfWDt0x3mvB9gDJdRjvBErGu5da/wrWfgQgY89aZq+
-MpGfOeGpoYdbwNxX+Bq/VuJB6YDCuvr68QnWqcLckCL33y0NZoGuTPoyq5eHpeda
-ER8Sto215PlOqQD1NUyzztZjub+spTzXkUffuJJTqFvoNl8BW8EoiA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 9d244978..00000000
--- a/swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-19.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-19.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-20.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-20.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index b0d2bcdb..00000000
--- a/swamid-2.0/nya-20.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-20.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO1vsI4TEoOvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDU2WhcNMjExMjEz
-MTQxNDU2WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu4H+LNiwie8PcQFOt/c8Tp6Ka7/xKPwu
-HJA9aoIwcqvEBSxF6jucwUww0cIXXLAGl4mC0xQmQP5BGU3dv48y+7x/CP3ky4Bw
-SRwN8DFGxLta2yiXCoi33/1h+/QBN8NbzzGpCWxwk03pRbbH3mMvv4B0THjgXQNs
-ayrQXV8447hzAXTX6KG6/ludMebl8YN5bs0RWocnNPDyyjEeiuoNaJWFbrS38zT6
-Wz4L4tQE+oR+Ae426B/x4mDsGLKpthIlNED+aadmAMkxm7yZWaK/f3QmaEqfRo4a
-puYfm6m4BsZKRiJkT0cPdJcGad7eeAV13idF/lYZsZXcDOcwlkE+NwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjAubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQpNsdmyCE64BeqY1ER
-7KjNlLRsHjANBgkqhkiG9w0BAQUFAAOCAQEAeamP2tTjQQWBGp06OddimPaXs501
-Mmfbyx9/Ji/t0g7Ri6t6J9q7Cpm+rBNSH7TVvZ7AXsXV0d3SApUa4+C6xZPUBo+f
-caF+V6v/MmKTp+I1wzwvDtCNlSAeSpQfVIlYIB0gMlvzygSFapsPz/W+JGduBnDT
-K+e9PTWPk9p6AbZ/0HHeYHje4uxWjuZ7uY/PL0SUBjvmyvJlOPdnAu5u/CSH/c3f
-QzJR8qCTEcxD+K9MO9gWpVJMmNqg5IFOmzhYnV/rMIwFOvFYK95C2slC11Fu0mcx
-0eTEA32/UWftAHwvOTIqYSlj9b/dPnq/2vYg8bETNy3SSufuaUFIq6M/HA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-20.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-20.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 6abf91e1..00000000
--- a/swamid-2.0/nya-20.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-20.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKpnq/GoAGJ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIyWhcNMjEwMjA4
-MDYzMDIyWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArDD2p6kR0pYxnbzsPJWq273fxk4nnUHu
-o9pTFJ8olIN2W9D+/0DBkifWfut0XMUQTke4NxXVX3LvEMAJgX79AAZ3lI3zf1OK
-d7gP2DKidxoZupqiocWOML2EGww7MD9VU7DurCuH7p3bl3HC278KvCP3LBtMUqOt
-CO8n8y5cMmp0Q2ErslmB78AGhII47P93baoRv61XE77Wb8e+fOrRLyuIiTqv/qZT
-x9V38kK4sxYAbLMoOWbwOP62xLgHXz3Fcq5mTHYzDUv8wRJpI45AMNAL4X/6aK9S
-EgHWD96fcwdQHdZD292gHdeXLqWzKNk/CjQ4kKx10+fEuZGZQgjqxwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQCIEpbDyhGybIbV0kknwJH
-BC0kxDANBgkqhkiG9w0BAQUFAAOCAQEAR6R+uQ8NdX5uanLv2Br7MKXtxB5FuIwn
-xpuc9PQIanHNJrkK+lrmuYOmbl3bfRNXUpXPsZHFg/5nsVivUmTPTKNQcL5p7yHv
-Cl+IJju/EZKE/8hPBEi22TOpRckGnjq/irEnSfHmdAM0sjy1lbOPVvMkRqwb4MDG
-ZVsCCiWm44WVgZRi/uNdC26xsKtb5LvG5ynpf3L0c1Tzb5aVfLVYmnIdf4YJxd9u
-au2vZNfZQgtLdtcm/CrfG77LQIVwwhX9xF+MA38+u2Zr2w+AqKRM24CPq1nwyKlt
-DYshArlN0SyQfXRlAJwlcfND5e3Y6n/Sqn8ttD7we8StRgkIgHKK4A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-20.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKpnq/GoAGJ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIyWhcNMjEwMjA4
-MDYzMDIyWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArDD2p6kR0pYxnbzsPJWq273fxk4nnUHu
-o9pTFJ8olIN2W9D+/0DBkifWfut0XMUQTke4NxXVX3LvEMAJgX79AAZ3lI3zf1OK
-d7gP2DKidxoZupqiocWOML2EGww7MD9VU7DurCuH7p3bl3HC278KvCP3LBtMUqOt
-CO8n8y5cMmp0Q2ErslmB78AGhII47P93baoRv61XE77Wb8e+fOrRLyuIiTqv/qZT
-x9V38kK4sxYAbLMoOWbwOP62xLgHXz3Fcq5mTHYzDUv8wRJpI45AMNAL4X/6aK9S
-EgHWD96fcwdQHdZD292gHdeXLqWzKNk/CjQ4kKx10+fEuZGZQgjqxwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQCIEpbDyhGybIbV0kknwJH
-BC0kxDANBgkqhkiG9w0BAQUFAAOCAQEAR6R+uQ8NdX5uanLv2Br7MKXtxB5FuIwn
-xpuc9PQIanHNJrkK+lrmuYOmbl3bfRNXUpXPsZHFg/5nsVivUmTPTKNQcL5p7yHv
-Cl+IJju/EZKE/8hPBEi22TOpRckGnjq/irEnSfHmdAM0sjy1lbOPVvMkRqwb4MDG
-ZVsCCiWm44WVgZRi/uNdC26xsKtb5LvG5ynpf3L0c1Tzb5aVfLVYmnIdf4YJxd9u
-au2vZNfZQgtLdtcm/CrfG77LQIVwwhX9xF+MA38+u2Zr2w+AqKRM24CPq1nwyKlt
-DYshArlN0SyQfXRlAJwlcfND5e3Y6n/Sqn8ttD7we8StRgkIgHKK4A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index ef5731a2..00000000
--- a/swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-20.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index e418e8ab..00000000
--- a/swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK+ohF/z2a5AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAzaNR+GankctYomcEanMhsz0XcS0IVOtLiphC10Owft2lM21nzV+xpAhr6rp42aOWHvfUosBRPskfE/LmvqAsCAwEAAaN/MH0wHQYDVR0OBBYEFH1fsHDIvkhQL1kYJs8guY8eFPkrME4GA1UdIwRHMEWAFH1fsHDIvkhQL1kYJs8guY8eFPkroSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAr6iEX/PZrkAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHkXPAAgeLOgL1bQFU7Ya9hGTPz/ehDsmnIgqf1Nt4Xzbg+31QVEzgEDZQbE8qVaNvzC2HeRrkIqM3yFgP6XXAw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-20.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAK+ohF/z2a5AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAzaNR+GankctYomcEanMhsz0XcS0IVOtLiphC10Owft2lM21nzV+xpAhr6rp42aOWHvfUosBRPskfE/LmvqAsCAwEAAaN/MH0wHQYDVR0OBBYEFH1fsHDIvkhQL1kYJs8guY8eFPkrME4GA1UdIwRHMEWAFH1fsHDIvkhQL1kYJs8guY8eFPkroSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAr6iEX/PZrkAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHkXPAAgeLOgL1bQFU7Ya9hGTPz/ehDsmnIgqf1Nt4Xzbg+31QVEzgEDZQbE8qVaNvzC2HeRrkIqM3yFgP6XXAw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8452/idp/profile/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/nya-20.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 74c64c1b..00000000
--- a/swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
-MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
-WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
-px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
-t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
-5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
-10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
-tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
-Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
-rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
-FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
-yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
-DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
-MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
-WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
-px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
-t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
-5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
-10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
-tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
-Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
-rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
-FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
-yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
-DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index bbc942ea..00000000
--- a/swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-20.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-20.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-21.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-21.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index bd1b3ea5..00000000
--- a/swamid-2.0/nya-21.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-21.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKOSYGaigK8eMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTAwWhcNMjExMjEz
-MTQxNTAwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOAOmiDNCPi56qR9z3k1vw/D794YHd/C
-r/iBY0hJxynu9WMZ8OmDgrIuCRlcbCnt/fwshEYrWIMhq5+IDxa2i2SrYBktqGSH
-YnWHILgFbpZRZQ8op635sfkFRylwJ8c6gqxSJoOXMh9gTgi5w2hh6Q1A65RGG63p
-4jVOLqG8Eo0oi/gQUKYdaaN2nS952YHeSk0YYm8u7XHuzs61froqlTg+WxZeDRHI
-JCMZ9O7ts4H+WtLIlH8aoDuRJY2f49GmILpNINmBZYihf4+ss5FbHl9ANeAmVVMZ
-dleCk8Tfh9RvFIBq3e2Rif1Sk1IY1lqJT8tFGJxzIl75BBiKE+EeTQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjEubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT3pP/IYhet+6VmY+RM
-lJQYr8NHuTANBgkqhkiG9w0BAQUFAAOCAQEAEC4dwV9TnGZfEL5ca1fDmjHxINpj
-ALbjP/AJW+cVN+FDuekkZ8VtU4BkYoPML4MdoiaO3+T7Hfq2adQsN6bNhyBXP9Bl
-V60M7D+VWCSC451uTQsCSUUCfytG33GVM+Ivxi+vnTFT0ZU0XdNyhTJiHZlhF4F2
-XLYyTIAvRplV3ElXVdONlh32PduBZoHIOo7pkXBcLxJAliuXukv4hPOgVAgiibmg
-+GjWWrX46wdk0vddGHHaBSANVF1bzpmK/9d9KaH5VlYgZFBLcUOsC7pvHnGgfi5E
-97ZUlG0iiQuCVhYgc2DPHAPIxdvqMP7fsbOFVyaOZQD6ppARkZyh2DrL3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 46eed8b6..00000000
--- a/swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-21.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALFcf2KAIUufMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMwWhcNMjEwMjI3
-MTYyODMwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1osBQ5UOG8GjJ+t9831MgbYGz50akhQ
-LMAJp7vWbeUiCyjRUq7zvoiKoDUoyspldEVbpXzOq7v3sxXwa9voL6lB4qivDj9+
-szpGYxfwrgtAoBvGW+GUdaIii8yAZmQ2F9/va2gtrR7h9p4Y3yRm/bSw8QYL3C68
-8fWtvXyRLM7eu8qySyjTPhMadB6kXaT7mP/d6dx3IWtIauNonvRDrSSL6hhCmLBq
-6CnAdO0MpEcgZVJ2MFMfkNFtgQDyyHUqPllxuj/E8+KEQnn91BGdI2CJFbcDkXwz
-ueJwXe4mWDbecm3Bn9D8WVRSDlyKLrV4Jp9ksLxm2u+6tjJBFJA41wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpdJrKn8Uzwlzhd5UrE2tQ
-PlJp1jANBgkqhkiG9w0BAQUFAAOCAQEAl3F8McTRgjdUs6GqXbFYZK/D0TTbqR0w
-qyWlZe+YjVp6nK0R97faNsjOwPGmOTYKiHDx43L8Um+zkQQfa9F60/l+JuNICNOO
-bgn7WtME9DLBbHLilHXGjPOZKPPPZSkFv6mFp5s6Na5qHjXRrR09N9LnvnF99XTQ
-WZgjiEhbYNDfbcP4eKmTqWh28XuMfSPL+j3XoKq2NQIW+UOiJevOKsGFSXGDHxJZ
-NpaHOS6Ks2FyvKSUELdMOCkYkNovZPVMXSHUVpNLxeDFCSAe3bqESli2M0XwdV00
-ihiaKSIEE2QJcpX6Jyo0EJShwzvOq7rB4Q1cZyF3/+JDl8vMQAtMrg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-21.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALFcf2KAIUufMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMwWhcNMjEwMjI3
-MTYyODMwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1osBQ5UOG8GjJ+t9831MgbYGz50akhQ
-LMAJp7vWbeUiCyjRUq7zvoiKoDUoyspldEVbpXzOq7v3sxXwa9voL6lB4qivDj9+
-szpGYxfwrgtAoBvGW+GUdaIii8yAZmQ2F9/va2gtrR7h9p4Y3yRm/bSw8QYL3C68
-8fWtvXyRLM7eu8qySyjTPhMadB6kXaT7mP/d6dx3IWtIauNonvRDrSSL6hhCmLBq
-6CnAdO0MpEcgZVJ2MFMfkNFtgQDyyHUqPllxuj/E8+KEQnn91BGdI2CJFbcDkXwz
-ueJwXe4mWDbecm3Bn9D8WVRSDlyKLrV4Jp9ksLxm2u+6tjJBFJA41wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpdJrKn8Uzwlzhd5UrE2tQ
-PlJp1jANBgkqhkiG9w0BAQUFAAOCAQEAl3F8McTRgjdUs6GqXbFYZK/D0TTbqR0w
-qyWlZe+YjVp6nK0R97faNsjOwPGmOTYKiHDx43L8Um+zkQQfa9F60/l+JuNICNOO
-bgn7WtME9DLBbHLilHXGjPOZKPPPZSkFv6mFp5s6Na5qHjXRrR09N9LnvnF99XTQ
-WZgjiEhbYNDfbcP4eKmTqWh28XuMfSPL+j3XoKq2NQIW+UOiJevOKsGFSXGDHxJZ
-NpaHOS6Ks2FyvKSUELdMOCkYkNovZPVMXSHUVpNLxeDFCSAe3bqESli2M0XwdV00
-ihiaKSIEE2QJcpX6Jyo0EJShwzvOq7rB4Q1cZyF3/+JDl8vMQAtMrg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-21.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-21.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index c6935f08..00000000
--- a/swamid-2.0/nya-21.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-21.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJNR7IcQKM+XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKDHezlRTa+MfK7ybE696Nf+vcwkUrkqOYjQNgSaTXb2AXEVZLO90IseTxZMOlxIqeCF9PuCP4W28Vk5RV/nG70CAwEAAaN/MH0wHQYDVR0OBBYEFJOfd1iwTcRnrcJxsGdlZNOmpAmuME4GA1UdIwRHMEWAFJOfd1iwTcRnrcJxsGdlZNOmpAmuoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkAk1HshxAoz5cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHxqpP/AqUt3ZIn4mT1/Rk1et+bek/k6hLbqosmdw05zXg+qWWy0VMvbxFkPfda+a+KYxU4R4bZTGb8LLplydZY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-21.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJNR7IcQKM+XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKDHezlRTa+MfK7ybE696Nf+vcwkUrkqOYjQNgSaTXb2AXEVZLO90IseTxZMOlxIqeCF9PuCP4W28Vk5RV/nG70CAwEAAaN/MH0wHQYDVR0OBBYEFJOfd1iwTcRnrcJxsGdlZNOmpAmuME4GA1UdIwRHMEWAFJOfd1iwTcRnrcJxsGdlZNOmpAmuoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkAk1HshxAoz5cwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHxqpP/AqUt3ZIn4mT1/Rk1et+bek/k6hLbqosmdw05zXg+qWWy0VMvbxFkPfda+a+KYxU4R4bZTGb8LLplydZY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index ee030233..00000000
--- a/swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-21.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANkmbpYTIXRMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALv9adRuGom25kRbs0JWupzhJEUYtpz8MgXpG7O6CqxmlLA3gSZWs5lYYIIc+9WdMPzRRmwZMlSDu8+3NnZ6jLUCAwEAAaN/MH0wHQYDVR0OBBYEFAAYj4HLbXnWXUQXSqmWxu4Hi91xME4GA1UdIwRHMEWAFAAYj4HLbXnWXUQXSqmWxu4Hi91xoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA2SZulhMhdEwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADLU5FACpYtm1OhLmqSAj4iEmdTgzOQcsX7hZgtekW+isQ23lXF61UM+tnRLqdwiSwTb8DkFkMqbxoKlQLbG0pk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-21.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJANkmbpYTIXRMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALv9adRuGom25kRbs0JWupzhJEUYtpz8MgXpG7O6CqxmlLA3gSZWs5lYYIIc+9WdMPzRRmwZMlSDu8+3NnZ6jLUCAwEAAaN/MH0wHQYDVR0OBBYEFAAYj4HLbXnWXUQXSqmWxu4Hi91xME4GA1UdIwRHMEWAFAAYj4HLbXnWXUQXSqmWxu4Hi91xoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA2SZulhMhdEwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADLU5FACpYtm1OhLmqSAj4iEmdTgzOQcsX7hZgtekW+isQ23lXF61UM+tnRLqdwiSwTb8DkFkMqbxoKlQLbG0pk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8452/idp/profile/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/nya-21.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-21.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 0f92d667..00000000
--- a/swamid-2.0/nya-21.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-21.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-21.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJg26jet2Q3XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMxWhcNMjEwMjI3
-MTYyODMxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0un7EXE+8dkUQ79q7iTAd5+Pmbh/Xr95
-Y/n6KQX833Td8UvGIIGOI9TASztBeC5+FA/7Niy8n5lXdA41u4PVnsAqkhqooyyG
-nM1RfCVUNnk3EW2+tCymUtp30LnKUSydPkvC2toeHZEb/o7kzq+Egcf+c80z+HjC
-Ut4mNqhuRv1sriX1PkbBnZwkL04/y+Wh9eXoCbVw0dJH6D7GazD3lwEaB7bPsy5c
-jtZSX89jFu8OrMI7B6pwvM/r2KYz0YT/75cSaM7UJwlb9KmMhjF0lpVc2eCzEhsf
-kACK5gxkZo7HFq+/kdhwmC6bMWfhVZQaFyx8WPg0+w50SMrccpz6VwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSkvTHNRlqlEKBIDQlZjRdV
-1KY/GjANBgkqhkiG9w0BAQUFAAOCAQEALrIIQVRBTM+IjaGDSyL0Vv+M6DeD8+qy
-Bv93gksswuPBgUu6Sg4s/MG4I/XCKNnoB16q7cLh6NlDN4CN7WYZaGtblmw1lMnZ
-Nbgw/ghCQWpJZ1AmMlSpH0Ew2YunUdRjMqJlaopgGHD9NZgpAtH6qWAw8d8JdzgS
-H9tL3L6GOp7rQEbGxVm+IXMQdMCazchEskcT6qe7Bixh/QOi0Sd4ZQULhu0vVS8O
-Tm4TeNirPPOJbRjbdh5Oz/ikn5kP7iTVdcvIfvn7F1dZnS15JMA2yxoXCysB9oj9
-8Vk3p9f3k2Uug3YtQK3uR3bZwffzni4GJqbYUq/ti8dcWMGZbBtyNg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-21.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJg26jet2Q3XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMxWhcNMjEwMjI3
-MTYyODMxWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0un7EXE+8dkUQ79q7iTAd5+Pmbh/Xr95
-Y/n6KQX833Td8UvGIIGOI9TASztBeC5+FA/7Niy8n5lXdA41u4PVnsAqkhqooyyG
-nM1RfCVUNnk3EW2+tCymUtp30LnKUSydPkvC2toeHZEb/o7kzq+Egcf+c80z+HjC
-Ut4mNqhuRv1sriX1PkbBnZwkL04/y+Wh9eXoCbVw0dJH6D7GazD3lwEaB7bPsy5c
-jtZSX89jFu8OrMI7B6pwvM/r2KYz0YT/75cSaM7UJwlb9KmMhjF0lpVc2eCzEhsf
-kACK5gxkZo7HFq+/kdhwmC6bMWfhVZQaFyx8WPg0+w50SMrccpz6VwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjEubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSkvTHNRlqlEKBIDQlZjRdV
-1KY/GjANBgkqhkiG9w0BAQUFAAOCAQEALrIIQVRBTM+IjaGDSyL0Vv+M6DeD8+qy
-Bv93gksswuPBgUu6Sg4s/MG4I/XCKNnoB16q7cLh6NlDN4CN7WYZaGtblmw1lMnZ
-Nbgw/ghCQWpJZ1AmMlSpH0Ew2YunUdRjMqJlaopgGHD9NZgpAtH6qWAw8d8JdzgS
-H9tL3L6GOp7rQEbGxVm+IXMQdMCazchEskcT6qe7Bixh/QOi0Sd4ZQULhu0vVS8O
-Tm4TeNirPPOJbRjbdh5Oz/ikn5kP7iTVdcvIfvn7F1dZnS15JMA2yxoXCysB9oj9
-8Vk3p9f3k2Uug3YtQK3uR3bZwffzni4GJqbYUq/ti8dcWMGZbBtyNg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-21.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-21.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 995ac27e..00000000
--- a/swamid-2.0/nya-21.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-21.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOc/VS8sqcwNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQ0b083Blgbrp/w8LjZqbVaXRFNhKFD6O4wVEddJOQFhndHpDkxd7s4fJjqkX5HoSsiRuF9q1jYEC6oXB3ewasCAwEAAaN/MH0wHQYDVR0OBBYEFLk4lnFr0YledzWBhr7RAnOU4ERVME4GA1UdIwRHMEWAFLk4lnFr0YledzWBhr7RAnOU4ERVoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA5z9VLyypzA0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA9fR2rcfPQf2Md9+lNRMxlVhz8nLvVPZRnXW2DW12vpt4J7W4heWZdXBNMc6qbthHOZ+OMk0desbx2tte35qb4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-21.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOc/VS8sqcwNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMyWhcNMjEwMjI3MTYyODMyWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQ0b083Blgbrp/w8LjZqbVaXRFNhKFD6O4wVEddJOQFhndHpDkxd7s4fJjqkX5HoSsiRuF9q1jYEC6oXB3ewasCAwEAAaN/MH0wHQYDVR0OBBYEFLk4lnFr0YledzWBhr7RAnOU4ERVME4GA1UdIwRHMEWAFLk4lnFr0YledzWBhr7RAnOU4ERVoSKkIDAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlggkA5z9VLyypzA0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA9fR2rcfPQf2Md9+lNRMxlVhz8nLvVPZRnXW2DW12vpt4J7W4heWZdXBNMc6qbthHOZ+OMk0desbx2tte35qb4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-22.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-22.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 38d36a24..00000000
--- a/swamid-2.0/nya-22.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-22.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAJb6YKMlMSccMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTAzWhcNMjExMjEz
-MTQxNTAzWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArJPfOYOMcKsO2tCEoXlnbco0oNhshQlP
-7SHO14NOF16JdF2W8euGpvlRB+NA39CZmvSMxNoOUmmuwmlagJ4i5fazv71blIy8
-CvuparhErcelmL44CbPTbvdqNOpLLIgWmT9/azVNMPdyHJNUvA533cB/deOWgwhk
-b8l9aILziBlFMqL58fIm7JZ6yQAROxEPUvn+pprC4+5Aoman7aXFiKT5fpXKX4w9
-zcpUTBy9z3TJUmuSIZBR5q+SKT3bMrpwVeZMhpGwbpmrjg+5gWVk2bEjzu7BjiME
-wpF+ww9eYNpsqzU4D8hPsy1XokJSd7M4ev6iJVK4Y0G7Zxj8ECWxsQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjIubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQTtSMSE6ik45DrURNP
-3yXlp7qZxzANBgkqhkiG9w0BAQUFAAOCAQEAonOEKtyv4GzqdGig//GuYhXBOpwZ
-Z6fo0N8Axa+5YSlGlM3EvXSS1+p+cPbpKPNmDxzc53F2MUoqx9EQjT5e7HBKBeZ9
-lCPuUVxLoC+1W5wH6dTwm9P86T6vVst/WcoLtFjYQ4T9BAs285oCCSepW37T541y
-jOZCrUXQwXO5mTS61kEXqA4tcYlw3MCtXKFAQa60RcZuEnlJf+qDC0QB2ErC42ot
-ddPDsaEmlGJctviuxJpn5jxlIjyZfKzsxG5/zaUGwxWVn1fQWQOTq1qyQIK9KTrB
-ZXlCO/zyPmju1bjLPNqeiNWRiBXj10LMH3e96gPcHrU82Lt9/nhfs2eq/w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-22.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-22.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 20437a0d..00000000
--- a/swamid-2.0/nya-22.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-22.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL/aTBCXFYFuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMzWhcNMjEwMjI3
-MTYyODMzWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Mxgs/yjF5TNx+vpxZWBzqKES4LYwhuX
-kd9ldaWbP50eSrGHfiMXI2Appv/GalnunaYyJrs93M+ps6NBvBawh0K9scu5iRqN
-UeaHl7sK5yYeioC9kTAIVlgx8XnNxp6ph5IB6WG2tq4sIwKfviJhzq/oT+5CNogW
-Wcm94YFeSub3GYlCRXPQzJrpwCJtFG9YGmUwKCZG+p3kwvg//NbaA4KgipswVqqz
-gzDHIDg57KbAZGJ2V6PCskef5woKzByHybcyEppPhSQy5C0rtby6VWn2eP7B/NL1
-xBPSg3vXYDYVBqVkHlU+0TiLGyg9wyE4XoNZ1s69OdY1xl/ppQ5H7QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS4cpYWAXhdQx33Jk+WJ8Tu
-nR3iVjANBgkqhkiG9w0BAQUFAAOCAQEAHWK1GRsSC8yX0+74q3yalOxyD32a95Ta
-R7V6ff8MTcLSF6t9us20SNYgUIGnZto/bhxZZlID/H23dMpz5R4/4t3a1S5H1O79
-0XHUq8zAFxwAOXYcz1he+fxoKHR4JjeXspQmWfxlFYuxk4fUJd3v1TW0drEY1AtT
-8DAO/00TfJ8bRUKEHqi45gUGOhthFASzX8hhymscPAwicp+8KqJxcZEZBst6pVwE
-1z48lanCAPBq0TDhWE4N9KF41dMSgjCdCj080TekTQv/vNsPEVmKI1pBrhIG5f0o
-NioMjs/wGzv5NqI/lvVaTI3ZibsONLAm95E2YsAozUmXpf49XE630Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-22.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL/aTBCXFYFuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODMzWhcNMjEwMjI3
-MTYyODMzWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Mxgs/yjF5TNx+vpxZWBzqKES4LYwhuX
-kd9ldaWbP50eSrGHfiMXI2Appv/GalnunaYyJrs93M+ps6NBvBawh0K9scu5iRqN
-UeaHl7sK5yYeioC9kTAIVlgx8XnNxp6ph5IB6WG2tq4sIwKfviJhzq/oT+5CNogW
-Wcm94YFeSub3GYlCRXPQzJrpwCJtFG9YGmUwKCZG+p3kwvg//NbaA4KgipswVqqz
-gzDHIDg57KbAZGJ2V6PCskef5woKzByHybcyEppPhSQy5C0rtby6VWn2eP7B/NL1
-xBPSg3vXYDYVBqVkHlU+0TiLGyg9wyE4XoNZ1s69OdY1xl/ppQ5H7QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS4cpYWAXhdQx33Jk+WJ8Tu
-nR3iVjANBgkqhkiG9w0BAQUFAAOCAQEAHWK1GRsSC8yX0+74q3yalOxyD32a95Ta
-R7V6ff8MTcLSF6t9us20SNYgUIGnZto/bhxZZlID/H23dMpz5R4/4t3a1S5H1O79
-0XHUq8zAFxwAOXYcz1he+fxoKHR4JjeXspQmWfxlFYuxk4fUJd3v1TW0drEY1AtT
-8DAO/00TfJ8bRUKEHqi45gUGOhthFASzX8hhymscPAwicp+8KqJxcZEZBst6pVwE
-1z48lanCAPBq0TDhWE4N9KF41dMSgjCdCj080TekTQv/vNsPEVmKI1pBrhIG5f0o
-NioMjs/wGzv5NqI/lvVaTI3ZibsONLAm95E2YsAozUmXpf49XE630Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-22.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-22.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 3672b473..00000000
--- a/swamid-2.0/nya-22.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-22.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM58CxL5RU/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKfkXD1Z7YURYCacXGiEwURSzxMns2ws+3/0duOfQ2u93kmNFxi8uX1RKZGFVQunJofc7MsC2vg9EgCXpjC+HEcCAwEAAaN/MH0wHQYDVR0OBBYEFINQ06+tab0DHHeHON4cbpom5jjjME4GA1UdIwRHMEWAFINQ06+tab0DHHeHON4cbpom5jjjoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAznwLEvlFT8owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFDeZ1zw6rmpoB72DIx8d9tUlJToEcvuNBkrwaHNkAxHUN1VZtUgE2NHuQ6bBx8E3nml5+7VMoiHtaB7z7G8aMw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-22.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM58CxL5RU/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKfkXD1Z7YURYCacXGiEwURSzxMns2ws+3/0duOfQ2u93kmNFxi8uX1RKZGFVQunJofc7MsC2vg9EgCXpjC+HEcCAwEAAaN/MH0wHQYDVR0OBBYEFINQ06+tab0DHHeHON4cbpom5jjjME4GA1UdIwRHMEWAFINQ06+tab0DHHeHON4cbpom5jjjoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAznwLEvlFT8owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFDeZ1zw6rmpoB72DIx8d9tUlJToEcvuNBkrwaHNkAxHUN1VZtUgE2NHuQ6bBx8E3nml5+7VMoiHtaB7z7G8aMw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 9de23812..00000000
--- a/swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-22.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIk2rW7DH6fVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOChsz8bfCpSVmntsAVfFtJhMcM/pMsEwf07bQUpAAtRiM8W0VrvWkgibn7zEc9oFjcgoTFvOxrejxRp+Z2dLjECAwEAAaN/MH0wHQYDVR0OBBYEFCQIzhcwTc3IAa/Re2HZXAQZ148DME4GA1UdIwRHMEWAFCQIzhcwTc3IAa/Re2HZXAQZ148DoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAiTatbsMfp9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0wCaL7J4iCdYF7Wlg0OBZUW3vt4P091QvfSMaQdDPKqvWgy2MxjGLj718+kLsRdQYEW2qV2a2ojc3cEoko1yQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-22.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAIk2rW7DH6fVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOChsz8bfCpSVmntsAVfFtJhMcM/pMsEwf07bQUpAAtRiM8W0VrvWkgibn7zEc9oFjcgoTFvOxrejxRp+Z2dLjECAwEAAaN/MH0wHQYDVR0OBBYEFCQIzhcwTc3IAa/Re2HZXAQZ148DME4GA1UdIwRHMEWAFCQIzhcwTc3IAa/Re2HZXAQZ148DoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAiTatbsMfp9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI0wCaL7J4iCdYF7Wlg0OBZUW3vt4P091QvfSMaQdDPKqvWgy2MxjGLj718+kLsRdQYEW2qV2a2ojc3cEoko1yQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8452/idp/profile/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/nya-22.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-22.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index d2813898..00000000
--- a/swamid-2.0/nya-22.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-22.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-22.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL3GQkwodq22MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM0WhcNMjEwMjI3
-MTYyODM0WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7EIplw5au2+YE8G6jRMrMFnR6qGS7vdJ
-Xd0AcfQ2CbmeBoTFOsGqlaPuIclgm8zaUg8qNZjiNDkrmgRqJHY+e8H0b3eCZFYE
-AuUXLuNPhV/NfAnQUrj0baKON58fCRwUXTwd1UDctaXq1D5SOz+WJ5hIv10lV9vM
-65XTNDkC7n+gim1yFWOPkvCPXJPe5VsMbs/RdhC98Vq/kiJnEYyYSd0S+vTUf5IB
-FiFoQY92jfvVLBBiZ8G5ITnCaVgVctAA3WRJYIqy5BWQXEKQZmr1T8ViOrKVtO4W
-wpbFBEKSdrTPC+ehyM6yDCl65jxra6Hiz/rPYPvpSlSgmJF5/dX+PwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSgJAqQkgguofAIs/0PdC5P
-d16G7DANBgkqhkiG9w0BAQUFAAOCAQEA5iVBp6sW5O1XuM3xDbTCySBZRv+Jhpjh
-q6gC9rVi4Bc4yc70j87GMQik/RPY/9uDYgw7vzjFNybuytYn7JkVq7K07HyeDj54
-/hTg7mz9SZ5vbkSxDh4ZS2V/GI8LJ4uDY+nfrX2xYbL6FaNIPTdvgCx94QvblFnV
-jFydADnVWPe20nUWApcYS9zFTX3+LLdWvtsL26tptIyxXolw2X8EM8+v9ENAdw4L
-jjj00wCW6g2lDQOxg6DdDvW59FmCG/Kjiuaj8HX4aOchdnp4jz30sBXFB6wa0v4Q
-ANjqu5Nik7dmEdQabHioZWmiBHz7BIxsVeBq4knZsD8xIapdJcMQUw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-22.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL3GQkwodq22MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM0WhcNMjEwMjI3
-MTYyODM0WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7EIplw5au2+YE8G6jRMrMFnR6qGS7vdJ
-Xd0AcfQ2CbmeBoTFOsGqlaPuIclgm8zaUg8qNZjiNDkrmgRqJHY+e8H0b3eCZFYE
-AuUXLuNPhV/NfAnQUrj0baKON58fCRwUXTwd1UDctaXq1D5SOz+WJ5hIv10lV9vM
-65XTNDkC7n+gim1yFWOPkvCPXJPe5VsMbs/RdhC98Vq/kiJnEYyYSd0S+vTUf5IB
-FiFoQY92jfvVLBBiZ8G5ITnCaVgVctAA3WRJYIqy5BWQXEKQZmr1T8ViOrKVtO4W
-wpbFBEKSdrTPC+ehyM6yDCl65jxra6Hiz/rPYPvpSlSgmJF5/dX+PwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjIubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSgJAqQkgguofAIs/0PdC5P
-d16G7DANBgkqhkiG9w0BAQUFAAOCAQEA5iVBp6sW5O1XuM3xDbTCySBZRv+Jhpjh
-q6gC9rVi4Bc4yc70j87GMQik/RPY/9uDYgw7vzjFNybuytYn7JkVq7K07HyeDj54
-/hTg7mz9SZ5vbkSxDh4ZS2V/GI8LJ4uDY+nfrX2xYbL6FaNIPTdvgCx94QvblFnV
-jFydADnVWPe20nUWApcYS9zFTX3+LLdWvtsL26tptIyxXolw2X8EM8+v9ENAdw4L
-jjj00wCW6g2lDQOxg6DdDvW59FmCG/Kjiuaj8HX4aOchdnp4jz30sBXFB6wa0v4Q
-ANjqu5Nik7dmEdQabHioZWmiBHz7BIxsVeBq4knZsD8xIapdJcMQUw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-22.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-22.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 8f22e6dc..00000000
--- a/swamid-2.0/nya-22.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-22.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIUGSAqVXvGSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANtWeRGcKBmwSJxCA2mZ/dfcFazEB4Y4Jv3KFiMkR4FF9mUZ3S9+0nAjQMLIEGKly0ynGSK4VKWwTR3BWkhUJxECAwEAAaN/MH0wHQYDVR0OBBYEFKcj7IvlZXoq0b0b7H+ohVc37skMME4GA1UdIwRHMEWAFKcj7IvlZXoq0b0b7H+ohVc37skMoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAhQZICpVe8ZIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKhnsKi2vSdPeTu5W8BzWl708Ztb7F2HJMKsPAVpHk9KAhqtqyi/GIxMBQxDGTWrs2Jy6RJnwF1ECEXZLNkz9GM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-22.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIUGSAqVXvGSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM1WhcNMjEwMjI3MTYyODM1WjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANtWeRGcKBmwSJxCA2mZ/dfcFazEB4Y4Jv3KFiMkR4FF9mUZ3S9+0nAjQMLIEGKly0ynGSK4VKWwTR3BWkhUJxECAwEAAaN/MH0wHQYDVR0OBBYEFKcj7IvlZXoq0b0b7H+ohVc37skMME4GA1UdIwRHMEWAFKcj7IvlZXoq0b0b7H+ohVc37skMoSKkIDAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlggkAhQZICpVe8ZIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKhnsKi2vSdPeTu5W8BzWl708Ztb7F2HJMKsPAVpHk9KAhqtqyi/GIxMBQxDGTWrs2Jy6RJnwF1ECEXZLNkz9GM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-23.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-23.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 20ec6e3e..00000000
--- a/swamid-2.0/nya-23.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-23.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALMtSLbFB/odMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTA3WhcNMjExMjEz
-MTQxNTA3WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoYE6NQt6vT54Y8D0O9pnT89kKAnO2YOr
-KSmX6HMHI05ErfjMSc3UH01SwwxOGrQfeGefNzwu3QL2idubpAwDmBeT9QKCo9Wy
-gMdFNoB8w7XUYHNAXJMMJBTnEF1ylXnMiZ3QYxh82oeLzZWeyB6lNU1CzzA8Ftn9
-R7r5cJqDlyxrpKsW51Br48gY/V8y2PO6wSMdX9vMkn8j8AK0An4Br5ea9T9Ov8Rp
-RjhGj3CQGI22t0a5dfYdWflGM9nMitv3aDnW0s4YLev6lARmnYfOl7gzJaLbVk2Y
-BVUy8Wamzz73cpFZHrUu08qX/dcFLntq4Q/GlXjsMMPY2Gmiao+EvQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjMubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQEXSj6fUiycSdF7Bnx
-iNYXNfU81zANBgkqhkiG9w0BAQUFAAOCAQEAVcRpb/lq59k9yLP8ZAd/TpL9vBwb
-hx+eyzoSlcjZfdr4iJpal0gbtvoxerd8W88C0vd0ZoLgtusTGmuo8V0kUx6WmYQR
-4HYFpw9ZpObpD3zq2i4J4G26rJTrdoHmmhmmyjnbHg5MsMB6jyh28Yk9RUXrTG6k
-9n7gwZ169uEXWolG1b2ch1tUJ7Tt4bHS6D8yQwC3rmIArOckL0vt9+SCOD8p959Q
-ueE7J31sPSdc0rNT/VrN+KDBteMBFVojh/KSFuKSmqjKq3FKWUWnSRQDojNW1iTY
-dA2i9sB0Cu8nKmw37PqM4mtcq371DdengqXWAtXbhTPmCRItJOIbSxBBBQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4cc25cc3..00000000
--- a/swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-23.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANbg77cPnGZEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM2WhcNMjEwMjI3
-MTYyODM2WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxhH9acWrdKXqRaTkncTfzdWDFiwsyddB
-MeM6AZdLeOUT8bp1i4UDh388Tx8mj2h9G9Ih7T9TEHRehsU8WL/A64LuLEmCaO3a
-YcWYE9u20yPXalX98W+SqNq7CuhxVJLHVIayHR+iM1Qa0rvsWrBxMwFJWVocbgOu
-mseXFNlwhFCJFqXhkiC6s6GBQYw6L3e/CsArOpnPsoAQ2B2ldoWIG7keFN+NPmv2
-u9TR2/bb0LH6jOBmphH+BsvF9dnoagnWAFV20JHoW06gqYDMBWTOElvc8jRqm2za
-meFgYp3/aTQMVSlvHLZXt+Zbhnxxbu4JbTC3bi/SU1IhxXvL1OBdTwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPllnJxLu+OmPTLGSpcc2q
-fXPYEjANBgkqhkiG9w0BAQUFAAOCAQEAASmwzSeiFNVIEkdomh0mug9XdAli42Co
-djyoL5+EMO0GYqzdM0lv99sTWWk6VEwIn0qHRZmqbxZ+Cr32Rqc0V6sSkCtiVzf5
-iIsaRCBb53NFd1JjLAGsyTm7pbQTp+nt/eM9QLn3MELe6f897Y9TPJcaFOfqOuSw
-1oN2G9n1//65GYs8De0E8aKPJ8lLueOzwXA+KcgdpqJgyxCfWb/e5QMe77YKngB5
-WZDPkTH+If/IESR6HxMc2YFQ6YqDT0WfwVWhOIeZInre6nAycOA9uBtjYLhWtved
-/6CV2q2TLkNFEO7evEjnea6czBgrgQSL3NBVAtv/rIoH2e2vIrAmKg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-23.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANbg77cPnGZEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM2WhcNMjEwMjI3
-MTYyODM2WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxhH9acWrdKXqRaTkncTfzdWDFiwsyddB
-MeM6AZdLeOUT8bp1i4UDh388Tx8mj2h9G9Ih7T9TEHRehsU8WL/A64LuLEmCaO3a
-YcWYE9u20yPXalX98W+SqNq7CuhxVJLHVIayHR+iM1Qa0rvsWrBxMwFJWVocbgOu
-mseXFNlwhFCJFqXhkiC6s6GBQYw6L3e/CsArOpnPsoAQ2B2ldoWIG7keFN+NPmv2
-u9TR2/bb0LH6jOBmphH+BsvF9dnoagnWAFV20JHoW06gqYDMBWTOElvc8jRqm2za
-meFgYp3/aTQMVSlvHLZXt+Zbhnxxbu4JbTC3bi/SU1IhxXvL1OBdTwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPllnJxLu+OmPTLGSpcc2q
-fXPYEjANBgkqhkiG9w0BAQUFAAOCAQEAASmwzSeiFNVIEkdomh0mug9XdAli42Co
-djyoL5+EMO0GYqzdM0lv99sTWWk6VEwIn0qHRZmqbxZ+Cr32Rqc0V6sSkCtiVzf5
-iIsaRCBb53NFd1JjLAGsyTm7pbQTp+nt/eM9QLn3MELe6f897Y9TPJcaFOfqOuSw
-1oN2G9n1//65GYs8De0E8aKPJ8lLueOzwXA+KcgdpqJgyxCfWb/e5QMe77YKngB5
-WZDPkTH+If/IESR6HxMc2YFQ6YqDT0WfwVWhOIeZInre6nAycOA9uBtjYLhWtved
-/6CV2q2TLkNFEO7evEjnea6czBgrgQSL3NBVAtv/rIoH2e2vIrAmKg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-23.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-23.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 6d80c904..00000000
--- a/swamid-2.0/nya-23.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-23.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-23.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 32ea3281..00000000
--- a/swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-23.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIT2fjtlyuzxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMOtaEKqwkQ+O8gH0gCT5ri8QtNi8pP274y3Np7j+ZIJ2x3PZ8Mau6TwjZ50Z4xOHtmidVF5ENHwDdSX5A6gp50CAwEAAaN/MH0wHQYDVR0OBBYEFJfrcAF1+EujdwiIW/ab5s61Yq+xME4GA1UdIwRHMEWAFJfrcAF1+EujdwiIW/ab5s61Yq+xoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkAhPZ+O2XK7PEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzTy+lLUIwL8WHo/Y0vwvMuPSMLMh7oj0Lg9FuIVkTuUyPAXIsR0x+83e098Dfogcbjkt/kxAORMIM9oSR5nyc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-23.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAIT2fjtlyuzxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMOtaEKqwkQ+O8gH0gCT5ri8QtNi8pP274y3Np7j+ZIJ2x3PZ8Mau6TwjZ50Z4xOHtmidVF5ENHwDdSX5A6gp50CAwEAAaN/MH0wHQYDVR0OBBYEFJfrcAF1+EujdwiIW/ab5s61Yq+xME4GA1UdIwRHMEWAFJfrcAF1+EujdwiIW/ab5s61Yq+xoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkAhPZ+O2XK7PEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzTy+lLUIwL8WHo/Y0vwvMuPSMLMh7oj0Lg9FuIVkTuUyPAXIsR0x+83e098Dfogcbjkt/kxAORMIM9oSR5nyc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8452/idp/profile/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/nya-23.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-23.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 1c463c84..00000000
--- a/swamid-2.0/nya-23.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-23.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-23.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALre7sAe5ozlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM3WhcNMjEwMjI3
-MTYyODM3WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPQ7MLqPI32J4tGKyVUadTxnywwQYQoI
-q0dmCAvd3TvbiGv3sXCKCzKSnsQ060kdcLj3WZRhqcFkHBccaiKw7InAo/g6cyyJ
-a/Ao5mf1cYUNEBcEvLyg5FWuOW8hUE6S9Qwi747SBQqqQsIr7PrmkLlgl/l1u9bz
-EQDcsrW3HFeGqo7juobOB1sVp2I291NJ4Aj+cO0+pbExYKOftVPig8WOiV9hizHk
-Q6Ou8mPMO1G2QHRFXK0usIz9Gl7Zd8WLI8f5/DQN5+J70hvurRYfPjWjh6NzMss6
-UDyzOfHCzZDTrSMF0mIhZcZ4cBELT8TyIF181FpwF/mS/fl2cEaB4wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTNRq59HkUZ8LiymaVyfzLj
-VV0lATANBgkqhkiG9w0BAQUFAAOCAQEAj/XhxkHfASY48DcmYC8vwbY1FOSQ4DQi
-XqwlUHt1q9r1CcmcrIlW8Ol0vIIxbYRMe+XzRATdgbmYc0PcMqqpO9EJH8cwMHKp
-yJsUh4IObl2iGM4XWBt/zKVGuL64GCsyPUnoXLox+MdQEmI6O5RyrTisJL/XJbro
-KBNJ2FV9QJ/Ti2LhViTGGKV5lJ8YD9eC/3cZwtEizL4UE2yhx4eVYCXMTJYikimN
-D/EHQd/XrAoj/qoPpTKzeS9rHX+poV1qaWJtTyCLsNx/hj2QaO4fAADyAhoSp5qI
-0YrJqdPY8mVMrVicaGRM2hrslHgtaioXNiypq7chN3SaoQolotAGjA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-23.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALre7sAe5ozlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM3WhcNMjEwMjI3
-MTYyODM3WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPQ7MLqPI32J4tGKyVUadTxnywwQYQoI
-q0dmCAvd3TvbiGv3sXCKCzKSnsQ060kdcLj3WZRhqcFkHBccaiKw7InAo/g6cyyJ
-a/Ao5mf1cYUNEBcEvLyg5FWuOW8hUE6S9Qwi747SBQqqQsIr7PrmkLlgl/l1u9bz
-EQDcsrW3HFeGqo7juobOB1sVp2I291NJ4Aj+cO0+pbExYKOftVPig8WOiV9hizHk
-Q6Ou8mPMO1G2QHRFXK0usIz9Gl7Zd8WLI8f5/DQN5+J70hvurRYfPjWjh6NzMss6
-UDyzOfHCzZDTrSMF0mIhZcZ4cBELT8TyIF181FpwF/mS/fl2cEaB4wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTNRq59HkUZ8LiymaVyfzLj
-VV0lATANBgkqhkiG9w0BAQUFAAOCAQEAj/XhxkHfASY48DcmYC8vwbY1FOSQ4DQi
-XqwlUHt1q9r1CcmcrIlW8Ol0vIIxbYRMe+XzRATdgbmYc0PcMqqpO9EJH8cwMHKp
-yJsUh4IObl2iGM4XWBt/zKVGuL64GCsyPUnoXLox+MdQEmI6O5RyrTisJL/XJbro
-KBNJ2FV9QJ/Ti2LhViTGGKV5lJ8YD9eC/3cZwtEizL4UE2yhx4eVYCXMTJYikimN
-D/EHQd/XrAoj/qoPpTKzeS9rHX+poV1qaWJtTyCLsNx/hj2QaO4fAADyAhoSp5qI
-0YrJqdPY8mVMrVicaGRM2hrslHgtaioXNiypq7chN3SaoQolotAGjA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-23.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-23.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 7dad989f..00000000
--- a/swamid-2.0/nya-23.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-23.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKQB/2+1sGqaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN/PvmIePjKFW6Va6I6eK+XxVIXdykJe+GY9l3PTOIALhUb4ir92jWlGQYXpXTh/+WqJGwfoPL+5mdq3WK7lKt8CAwEAAaN/MH0wHQYDVR0OBBYEFCWiF7BkM/zs86okl98WdQsWe6I2ME4GA1UdIwRHMEWAFCWiF7BkM/zs86okl98WdQsWe6I2oSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkApAH/b7WwapowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAx8AB7lnuhRQEImiTj99mnA8qBVbCRxEh6WVG4vURf2jUQmUpn6CarLuPeCh/KTpAEcVxVFo+GLyhn5e+gt6Lc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-23.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKQB/2+1sGqaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN/PvmIePjKFW6Va6I6eK+XxVIXdykJe+GY9l3PTOIALhUb4ir92jWlGQYXpXTh/+WqJGwfoPL+5mdq3WK7lKt8CAwEAAaN/MH0wHQYDVR0OBBYEFCWiF7BkM/zs86okl98WdQsWe6I2ME4GA1UdIwRHMEWAFCWiF7BkM/zs86okl98WdQsWe6I2oSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkApAH/b7WwapowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAx8AB7lnuhRQEImiTj99mnA8qBVbCRxEh6WVG4vURf2jUQmUpn6CarLuPeCh/KTpAEcVxVFo+GLyhn5e+gt6Lc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-24.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-24.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 89a5ca03..00000000
--- a/swamid-2.0/nya-24.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-24.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMwU5b6xeN15MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTExWhcNMjExMjEz
-MTQxNTExWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QHDcZdS80NvgWqcTxcYKWjgKTn/cCZ8
-eixCgEI1kdeRTWdWJAggdz1gjaXqxsfwpM+DnjC9j1et00xOk9sryjl+3iJ7cEGv
-oLvD0kkfptOcqY+zV5VNSC/3QacuW93MkQEkvqpTeKJEbGbpRluF+incXqeDlGqY
-1nJYZ6Ac2k8gHMoF1PRIkaNJjhK2ki0Suf9IK2mO6nG9GEPB+ZFfaOYughv095r+
-1YXKrti4FCQH/81RuH005EbQQcE0MzD8WngFWbQ3A5JrAdPRw5+lCUum8Q3n6X5q
-xbpE5DbCsv9JjojUudk/Q0nesS0u6ZWU6gaQH/73WFI1qOrSb2qwLwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjQubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQHd7wcFAY+T5qgIHkB
-GzdILP47hTANBgkqhkiG9w0BAQUFAAOCAQEAmMF+KIpVa8l0eqOoOyaSFT86kPzj
-Ao1N/NlXjZy2zvyRVhXN7ZvM660x6FOKFy1KqIUeYiJf/Y2M3FCiD+His6YDr0vJ
-fRcEjguHKc01dYEC83hLh1DSd10mHtlb/yNPtXEjBZ3Ytl9fA7UaB3d3b9V2geah
-oGs8razeMsgqqGwx0EfKa+yH1bxlqADr+XIp3wBlsPx0Ll+B9Y8GMoi+GC+S0+T/
-XxRTKJAXoCeGHHQD+bGqDsG3+iKhlZ5E/41a9eg9fKjOObb6BI2EVIwtk7InVR+L
-3jhWFfFzqs/YZQjFrZo0Sncl03R+EzsFvmFRmYXdp89BXQOgVDml4BrCEA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-24.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-24.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index b6a19173..00000000
--- a/swamid-2.0/nya-24.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-24.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJWdCC4u6nzdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM5WhcNMjEwMjI3
-MTYyODM5WjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyAVm4ULVNO3mk0hqel0dFiD5BSpFVvpZ
-qSIWtrTB0BA7pWRtPk5/c7LMg4t5u0PYCGY402nuSt/wm5Q6HwLG9iF6IUJRrtBs
-weYu0lgaSVRzk4EURwwsvAbvPQXtS3OCkNjRAtWVBBQh95cJifHtVZYIIoE/8A4u
-6pUsgfrxbvFbvwea2nLG7aBLk4d/hosuuxhwKKqMElT3pCbNYOlZAgZgXhTDKR/Q
-5TTFOxCkW3hWwhs0cneIUbexzSrJ/ZJvtXcmhVBHau9v+N0twIua8IfUpGxIaqtN
-PUOhf+UlatTN5zEoRDjHnmrumXX0xC3QD1o+mWX2fu5ZEyRBFae07wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTWGMKg7imhqpSnYcgKYKT4
-8NAHlDANBgkqhkiG9w0BAQUFAAOCAQEAi4YTPYhaP8GlGhowv27s+aI6b5q3ZOE8
-Mc7dFJDT7/1Hqg6lYIAsDNJSCNS5sDTFk6PN7xOaFhwB6U+UU3fT+k2jF7BDaT7t
-xV8dJFQLOVRmF6U7UVYzIvhtskhDpdohmZtsWY+eBNsvHDyMMiA/1WWNgldqdCv0
-xTbp4W1xbzmM8jc17OFcHLUHZGvkLfuVcBV50XOQq5SNQqR0QjOCF5j16Uogu4CK
-6WDtx1WcT097v6VxOoNci3ivadFQT2xnBsoo4bu79sP6kK6ItZgjAG3/2EEnpCYE
-pN+aHLN+CCLWIwcveWDJkn3GF7UN6H2hos6GvtnwrkLw7VNasMM/iw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-24.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJWdCC4u6nzdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM5WhcNMjEwMjI3
-MTYyODM5WjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyAVm4ULVNO3mk0hqel0dFiD5BSpFVvpZ
-qSIWtrTB0BA7pWRtPk5/c7LMg4t5u0PYCGY402nuSt/wm5Q6HwLG9iF6IUJRrtBs
-weYu0lgaSVRzk4EURwwsvAbvPQXtS3OCkNjRAtWVBBQh95cJifHtVZYIIoE/8A4u
-6pUsgfrxbvFbvwea2nLG7aBLk4d/hosuuxhwKKqMElT3pCbNYOlZAgZgXhTDKR/Q
-5TTFOxCkW3hWwhs0cneIUbexzSrJ/ZJvtXcmhVBHau9v+N0twIua8IfUpGxIaqtN
-PUOhf+UlatTN5zEoRDjHnmrumXX0xC3QD1o+mWX2fu5ZEyRBFae07wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTWGMKg7imhqpSnYcgKYKT4
-8NAHlDANBgkqhkiG9w0BAQUFAAOCAQEAi4YTPYhaP8GlGhowv27s+aI6b5q3ZOE8
-Mc7dFJDT7/1Hqg6lYIAsDNJSCNS5sDTFk6PN7xOaFhwB6U+UU3fT+k2jF7BDaT7t
-xV8dJFQLOVRmF6U7UVYzIvhtskhDpdohmZtsWY+eBNsvHDyMMiA/1WWNgldqdCv0
-xTbp4W1xbzmM8jc17OFcHLUHZGvkLfuVcBV50XOQq5SNQqR0QjOCF5j16Uogu4CK
-6WDtx1WcT097v6VxOoNci3ivadFQT2xnBsoo4bu79sP6kK6ItZgjAG3/2EEnpCYE
-pN+aHLN+CCLWIwcveWDJkn3GF7UN6H2hos6GvtnwrkLw7VNasMM/iw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-24.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-24.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 74abbb77..00000000
--- a/swamid-2.0/nya-24.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-24.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJBlo931O0kDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXWMsS5is4X6dCQciuul6t+PBdpkHGETmeDH9NAe0ZkoZ+6VDCMZ/F0IL+NrtxZEK02doazRGm0gkRU2HOPJPcCAwEAAaN/MH0wHQYDVR0OBBYEFJCB24n8pOVO/RjtgbnPR/lB41SBME4GA1UdIwRHMEWAFJCB24n8pOVO/RjtgbnPR/lB41SBoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAkGWj3fU7SQMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJIfkPpRX01NMt+zeWez/cNcltWjcJSo9huh7Okd2P9N4gqpNwhydtpKMUtfNz3reeXrQ1vESbrdUAJl7CPrWNE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-24.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJBlo931O0kDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXWMsS5is4X6dCQciuul6t+PBdpkHGETmeDH9NAe0ZkoZ+6VDCMZ/F0IL+NrtxZEK02doazRGm0gkRU2HOPJPcCAwEAAaN/MH0wHQYDVR0OBBYEFJCB24n8pOVO/RjtgbnPR/lB41SBME4GA1UdIwRHMEWAFJCB24n8pOVO/RjtgbnPR/lB41SBoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAkGWj3fU7SQMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJIfkPpRX01NMt+zeWez/cNcltWjcJSo9huh7Okd2P9N4gqpNwhydtpKMUtfNz3reeXrQ1vESbrdUAJl7CPrWNE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 22a5dc6e..00000000
--- a/swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-24.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAO3P44qBWFzaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANKSPH1NhVtLyPH2ZdaNQZ17FylWWfni3PQQpx064CWlc5RdbstpW5ZP4T8Fk82xn16yEM3XWkNBdqNdnNLXpvsCAwEAAaN/MH0wHQYDVR0OBBYEFETl4Ug3EYGmrMSUCHupgZwGDf5UME4GA1UdIwRHMEWAFETl4Ug3EYGmrMSUCHupgZwGDf5UoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkA7c/jioFYXNowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzY70xJmP2zNqBqOR9KjQiszw37vDdmriTt0JGQvRi7R9/Fnia+exUrWvw+kP4SrUFpsYTbvHoFOiMBheYBJDs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-24.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAO3P44qBWFzaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANKSPH1NhVtLyPH2ZdaNQZ17FylWWfni3PQQpx064CWlc5RdbstpW5ZP4T8Fk82xn16yEM3XWkNBdqNdnNLXpvsCAwEAAaN/MH0wHQYDVR0OBBYEFETl4Ug3EYGmrMSUCHupgZwGDf5UME4GA1UdIwRHMEWAFETl4Ug3EYGmrMSUCHupgZwGDf5UoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkA7c/jioFYXNowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGzY70xJmP2zNqBqOR9KjQiszw37vDdmriTt0JGQvRi7R9/Fnia+exUrWvw+kP4SrUFpsYTbvHoFOiMBheYBJDs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8452/idp/profile/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/nya-24.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index e1bee9b6..00000000
--- a/swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-24.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-24.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK713ALYAB9MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQwWhcNMjEwMjI3
-MTYyODQwWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1FTy3dn7iCtDAEWmjJJxVdRs//aYtBqL
-Qe0eyeh8s6ZTqy00anqcG2d+IBsMVp3YHYf2m5iBdxPOUBskXTa5nMOBGZHq1ETR
-4WgbwnA/BXiBOvO0U13bFe/+Ki7/8UC7hnKJa4+DEK7Ix/5qcsbm8ycQNn0KcIse
-ZvCQ0BUFf91poUPzBj6VHoEygm1wCwgk1KTK0ydk7iq77UQlSLiguYS6xeRsGguK
-OCYaIYPRyHHenqzTuj0hwOeRfJsJigpLcMCgLSuGYbA7yNLCFqAKVDCMApNqdKpJ
-ttSwusQvXCcWzWOikasEteIqnaQvFaLloxZfYmiOpJI0Gr/WU9+HxwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRYG+yDfHlrXlfaaLEdiNQo
-altoJDANBgkqhkiG9w0BAQUFAAOCAQEAZIZlCdR5Y7+cWQIOSy9UIYImLhduZhO5
-PRSF2pTIkOc5GVU8XiQfvXE4cIz81eHTuQzD17Mj0vpJZ+Kff3UzlC2UdGvLZFJq
-GbNw/X0iNlTDGFqmV1gUoaDYdjscXDfUMvyxDPgqqC9Br51Hx3lUE0Rz0vc5Pvad
-k6+YrXv6JqVBG2CxPn+6S4RRexRpwl+ZcVYnSQd4hGc8EpERBsoaoOTVoPlPCSd/
-2/tUFqk0+1ohnogsUBgF/XoxTjO3JGpSrTRpGi5Kodlwn15BMFfH01PBZTQUE22N
-jzzpRcNDl02XzRamPoUJOUcLjCYUzRXNG52ydZh32L6QIazU3Qpt4w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-24.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK713ALYAB9MMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQwWhcNMjEwMjI3
-MTYyODQwWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1FTy3dn7iCtDAEWmjJJxVdRs//aYtBqL
-Qe0eyeh8s6ZTqy00anqcG2d+IBsMVp3YHYf2m5iBdxPOUBskXTa5nMOBGZHq1ETR
-4WgbwnA/BXiBOvO0U13bFe/+Ki7/8UC7hnKJa4+DEK7Ix/5qcsbm8ycQNn0KcIse
-ZvCQ0BUFf91poUPzBj6VHoEygm1wCwgk1KTK0ydk7iq77UQlSLiguYS6xeRsGguK
-OCYaIYPRyHHenqzTuj0hwOeRfJsJigpLcMCgLSuGYbA7yNLCFqAKVDCMApNqdKpJ
-ttSwusQvXCcWzWOikasEteIqnaQvFaLloxZfYmiOpJI0Gr/WU9+HxwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjQubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRYG+yDfHlrXlfaaLEdiNQo
-altoJDANBgkqhkiG9w0BAQUFAAOCAQEAZIZlCdR5Y7+cWQIOSy9UIYImLhduZhO5
-PRSF2pTIkOc5GVU8XiQfvXE4cIz81eHTuQzD17Mj0vpJZ+Kff3UzlC2UdGvLZFJq
-GbNw/X0iNlTDGFqmV1gUoaDYdjscXDfUMvyxDPgqqC9Br51Hx3lUE0Rz0vc5Pvad
-k6+YrXv6JqVBG2CxPn+6S4RRexRpwl+ZcVYnSQd4hGc8EpERBsoaoOTVoPlPCSd/
-2/tUFqk0+1ohnogsUBgF/XoxTjO3JGpSrTRpGi5Kodlwn15BMFfH01PBZTQUE22N
-jzzpRcNDl02XzRamPoUJOUcLjCYUzRXNG52ydZh32L6QIazU3Qpt4w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-24.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-24.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index f301015e..00000000
--- a/swamid-2.0/nya-24.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-24.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIYa0D/uvu1VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEqEGh6Sg9lfhIQPNowivKjqnD0BRc9Dz5THbunWl9EfN3BCUU4CJjPnSsf4HzS04GL1IPV/EyZkETvRQxaB5MCAwEAAaN/MH0wHQYDVR0OBBYEFA5WEJDvVkGd9qY/JMJk0ORtkmTeME4GA1UdIwRHMEWAFA5WEJDvVkGd9qY/JMJk0ORtkmTeoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAhhrQP+6+7VUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEvuBQiZh7Ln/N5iWYHRwLB7mXbw+OFsY7YLlACxc5D/siX7NrD4XSIzUB0hJUtxuCh28ddOOV+RBHQU3pgYj1w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-24.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIYa0D/uvu1VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQxWhcNMjEwMjI3MTYyODQxWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANEqEGh6Sg9lfhIQPNowivKjqnD0BRc9Dz5THbunWl9EfN3BCUU4CJjPnSsf4HzS04GL1IPV/EyZkETvRQxaB5MCAwEAAaN/MH0wHQYDVR0OBBYEFA5WEJDvVkGd9qY/JMJk0ORtkmTeME4GA1UdIwRHMEWAFA5WEJDvVkGd9qY/JMJk0ORtkmTeoSKkIDAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlggkAhhrQP+6+7VUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEvuBQiZh7Ln/N5iWYHRwLB7mXbw+OFsY7YLlACxc5D/siX7NrD4XSIzUB0hJUtxuCh28ddOOV+RBHQU3pgYj1w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-25.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-25.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index b05db47f..00000000
--- a/swamid-2.0/nya-25.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-25.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO7ZSc18TVEiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTE0WhcNMjExMjEz
-MTQxNTE0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtSvqKivRA4sXNrnw29MlUqwn2We+4geL
-32iCOTihoIP3hJN1j7Hh8rLw4K+aLEFgFP+ufA4004VasE9D/OJSG2iTT1Xvdoj5
-fnkbQnOAJ+C+gge5WaXc4HFFezdxz3bJQIFD3bKXGDRz5D2sg8yjOnPe7C8xEEEW
-F7Qltq9H1APRiWK/YNPO2COjX2fmbqfNW+mi0tPgzQDpo5UNYcyseZlLc2ev1SM5
-ZrSdHoGns/uAu0kx9KIlA88DsyZkQJEpCFO6vPu6gFlHDH9ll5awo4x93wx4IAu7
-JKlHkpQilbnaewqJfgZ8COWvTBXv6bPU6PzaqmlnmVedI+SIqu6qEwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjUubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRh9z8xSC1qtNjxw056
-+rLTd06JKjANBgkqhkiG9w0BAQUFAAOCAQEAUpH8cqG0/qOAPElZ9uG+8ShkSdyH
-jAnTfhmm47B2iKbSwChskKZOYNjIFS1QrlEzdHWKvME1awtszGLSt70KdOh5TsoN
-FVPI8q83fndg6MHEO/mbNOTyCO4gPJtJSD8Re2RG7zPvt7uKojSbsuk4DUQcI0mt
-EJku3iDsNOp2A1A9c/fXwdyIzZdWn1gpwPJEH2d2fvEQOCbYmc4oh0u/3h+aEkY+
-7k387Ap8m6ySG5KVMzyY2MJjSrCaUCGy7xes85FtOBKAU6xUQ/zFE0A5AFmElcOv
-NRj6t/LuaLUR1y8KVvU3wbgIIlWGQfVzOleB/hm52MlKne52F0E4+11OGg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 016ac579..00000000
--- a/swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-25.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPyhXHCVywzcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQyWhcNMjEwMjI3
-MTYyODQyWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6kngf3uludc3rumLrFUX+8OQA5Z3gvC3
-TGfcWvPjpnF0mMvQt8lpB4Ctfg91IT3ogv9igZRvAyvEcyVNhQJHLpfK7oyeYeX2
-NBh8bYXhddYmrA4EgFyfpCHSavmleryM6yBV6PsdnatrL0B2for1lU2hbwqoZJyR
-zxer9xaFmeGe6tL2OcwYQfRGrPqKGeMd4qd0LYZ/ci0L90Mf4QDsZn1RuPLR8NkA
-nT9zuWaminu7+R37wP7YG86CLbbyR5mvPGyhR71at5Bbuash3F3iX3NfCFoRTV4Y
-ZUC/TahoCve1XWyT/wPomATKx5BLvaO8tHg7Cn3+5fU75XrSt57GzwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSL7XIkNrGrilg9Oc3VoNVY
-v5+wdTANBgkqhkiG9w0BAQUFAAOCAQEA1NNPHf278DOaknm7oixU9BYlCj4Xo48J
-tYX+aIkEZgSoC4lZKj5Aa5HZmPxYBha0Of9PnDf5CyFsOSZ6uzIBA+kK4M8fdsTm
-3cXDwoGktFHV6tPREKcM3y7vjzRj1NP4f5zmIRett0mGM2117hNxGbQ02ihr6r6G
-nfY+6KZTveW/1DOzr7X68zbFGS0+B2Kah6f2jzYuJcMsez86aurqjs1I7JG6wMEP
-gXBqbiL4/Fcu3K0+U3yZzaEhqoG4tbRiLyEG9QJRXilJNoe+uMgnKdRta+25WfUp
-kwG5TATa/a2H9EktIQdtJ999AW7b5P2xNRlNMuJmKup0wQLEEUS9aw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-25.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPyhXHCVywzcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQyWhcNMjEwMjI3
-MTYyODQyWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6kngf3uludc3rumLrFUX+8OQA5Z3gvC3
-TGfcWvPjpnF0mMvQt8lpB4Ctfg91IT3ogv9igZRvAyvEcyVNhQJHLpfK7oyeYeX2
-NBh8bYXhddYmrA4EgFyfpCHSavmleryM6yBV6PsdnatrL0B2for1lU2hbwqoZJyR
-zxer9xaFmeGe6tL2OcwYQfRGrPqKGeMd4qd0LYZ/ci0L90Mf4QDsZn1RuPLR8NkA
-nT9zuWaminu7+R37wP7YG86CLbbyR5mvPGyhR71at5Bbuash3F3iX3NfCFoRTV4Y
-ZUC/TahoCve1XWyT/wPomATKx5BLvaO8tHg7Cn3+5fU75XrSt57GzwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSL7XIkNrGrilg9Oc3VoNVY
-v5+wdTANBgkqhkiG9w0BAQUFAAOCAQEA1NNPHf278DOaknm7oixU9BYlCj4Xo48J
-tYX+aIkEZgSoC4lZKj5Aa5HZmPxYBha0Of9PnDf5CyFsOSZ6uzIBA+kK4M8fdsTm
-3cXDwoGktFHV6tPREKcM3y7vjzRj1NP4f5zmIRett0mGM2117hNxGbQ02ihr6r6G
-nfY+6KZTveW/1DOzr7X68zbFGS0+B2Kah6f2jzYuJcMsez86aurqjs1I7JG6wMEP
-gXBqbiL4/Fcu3K0+U3yZzaEhqoG4tbRiLyEG9QJRXilJNoe+uMgnKdRta+25WfUp
-kwG5TATa/a2H9EktIQdtJ999AW7b5P2xNRlNMuJmKup0wQLEEUS9aw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-25.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-25.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 1deb921b..00000000
--- a/swamid-2.0/nya-25.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-25.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK7c8my5ph+oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALWn6WCArMQJhfduLd/uW1MPPxY6vMFeBLXWKKz7XtnJf87ZiiORcB+y0FzamFU0789i1CpoINf+YRG88xPK9lECAwEAAaN/MH0wHQYDVR0OBBYEFI1Uxf3NMwsjkdXFSpo7hjPR1asBME4GA1UdIwRHMEWAFI1Uxf3NMwsjkdXFSpo7hjPR1asBoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkArtzybLmmH6gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHvGsE/AO9v+C43wylKpRFHMYl1L5JrKLepsxM9A2bj2FcXo8g1poBqAiQ1T58IkQpYrmKUZYEBefkkow5rWGo8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-25.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK7c8my5ph+oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALWn6WCArMQJhfduLd/uW1MPPxY6vMFeBLXWKKz7XtnJf87ZiiORcB+y0FzamFU0789i1CpoINf+YRG88xPK9lECAwEAAaN/MH0wHQYDVR0OBBYEFI1Uxf3NMwsjkdXFSpo7hjPR1asBME4GA1UdIwRHMEWAFI1Uxf3NMwsjkdXFSpo7hjPR1asBoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkArtzybLmmH6gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHvGsE/AO9v+C43wylKpRFHMYl1L5JrKLepsxM9A2bj2FcXo8g1poBqAiQ1T58IkQpYrmKUZYEBefkkow5rWGo8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 53c1ca2a..00000000
--- a/swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-25.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPVoZrBJp4/NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/BV6cMQViERQL456XNFBK8JPSuvkYmrdMEquSKsSlZ1fojjQT0H8fUl08VqpV+Bq2CUH/EC//Et9mFVuIrJh8CAwEAAaN/MH0wHQYDVR0OBBYEFEZqeESVjNkClhdI6Mpgb6hu8mQAME4GA1UdIwRHMEWAFEZqeESVjNkClhdI6Mpgb6hu8mQAoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA9WhmsEmnj80wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIPxzdEtwIRoznueoVXIFE8p/SkNq/KE4EfYSfXDJkvnr0C3k5I6JlpYSkGtQb0aFSzAfr2PeiFm1HxOxwl/aKc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-25.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAPVoZrBJp4/NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM/BV6cMQViERQL456XNFBK8JPSuvkYmrdMEquSKsSlZ1fojjQT0H8fUl08VqpV+Bq2CUH/EC//Et9mFVuIrJh8CAwEAAaN/MH0wHQYDVR0OBBYEFEZqeESVjNkClhdI6Mpgb6hu8mQAME4GA1UdIwRHMEWAFEZqeESVjNkClhdI6Mpgb6hu8mQAoSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA9WhmsEmnj80wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIPxzdEtwIRoznueoVXIFE8p/SkNq/KE4EfYSfXDJkvnr0C3k5I6JlpYSkGtQb0aFSzAfr2PeiFm1HxOxwl/aKc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8452/idp/profile/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/nya-25.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-25.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 3d2ed26d..00000000
--- a/swamid-2.0/nya-25.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-25.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-25.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALwUSHQ3qkJpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3
-MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqTGHLrrNH1tvki7NlnizZsNL6FtZTKL
-BwHv9bVtyy4e0I2AMs278vZtUk5AWEIr8Y3PAD8hjhDvW0yEubku7eLNFFS9WNyY
-HGjpLN1TPIGizer2wj9UFKfTQj9CBkOi2WZJRa5mcziCErN7O06LNzDOogoPmiHX
-d0TaDP3YJaMpw1xY7mqWioM4ATzlKU/lqJyoIJwnCm9t174fEnWIQBVUD6Fa7m2d
-q+8+2QmYFUE/eWHiDRxB3zsx3K+2DDrcseOxSw5y23Aa3sgPozz4eG7ncIBZKtbO
-hXyVYtrLs7P0dPVVrPyxzU+2462jbJ3R85LY7+HfRipD0tfssH81ZQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQPehx6KmClTeH1dqHcj7ho
-FTtIXTANBgkqhkiG9w0BAQUFAAOCAQEAYXTArIhJw9ydQpYXTgidHjHfpkhsnD9k
-bzR1yGXFr1nJamZIHI1BC2OFNn0ORxfqHir2uA+44GiyvVPKbGQ3Ju5BkMbCkC78
-K9rJ+s2WhMlh1LpIT2/y7e/105KBYZ1+GO0TM6F7l0yVDlB0r1TtBqq8mmgR9UDY
-tGrSVVuKzm08GxuLtHrZgnWr2c7Gg1Z2oj1wLiipIuiT4gMF2I9FsCANcCcHaHpu
-p7XjWLjtjC9lD9wn82J8zsxswWiqsFo1pQ8FsW1wemslO7mR1bmMrg2VyCzC5AcZ
-BwTfEfdEuaZ8Qw506JRGKv9VbiefYZ9Tv57lD5mq7h4AIus5MiGNLQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-25.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALwUSHQ3qkJpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQzWhcNMjEwMjI3
-MTYyODQzWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqTGHLrrNH1tvki7NlnizZsNL6FtZTKL
-BwHv9bVtyy4e0I2AMs278vZtUk5AWEIr8Y3PAD8hjhDvW0yEubku7eLNFFS9WNyY
-HGjpLN1TPIGizer2wj9UFKfTQj9CBkOi2WZJRa5mcziCErN7O06LNzDOogoPmiHX
-d0TaDP3YJaMpw1xY7mqWioM4ATzlKU/lqJyoIJwnCm9t174fEnWIQBVUD6Fa7m2d
-q+8+2QmYFUE/eWHiDRxB3zsx3K+2DDrcseOxSw5y23Aa3sgPozz4eG7ncIBZKtbO
-hXyVYtrLs7P0dPVVrPyxzU+2462jbJ3R85LY7+HfRipD0tfssH81ZQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQPehx6KmClTeH1dqHcj7ho
-FTtIXTANBgkqhkiG9w0BAQUFAAOCAQEAYXTArIhJw9ydQpYXTgidHjHfpkhsnD9k
-bzR1yGXFr1nJamZIHI1BC2OFNn0ORxfqHir2uA+44GiyvVPKbGQ3Ju5BkMbCkC78
-K9rJ+s2WhMlh1LpIT2/y7e/105KBYZ1+GO0TM6F7l0yVDlB0r1TtBqq8mmgR9UDY
-tGrSVVuKzm08GxuLtHrZgnWr2c7Gg1Z2oj1wLiipIuiT4gMF2I9FsCANcCcHaHpu
-p7XjWLjtjC9lD9wn82J8zsxswWiqsFo1pQ8FsW1wemslO7mR1bmMrg2VyCzC5AcZ
-BwTfEfdEuaZ8Qw506JRGKv9VbiefYZ9Tv57lD5mq7h4AIus5MiGNLQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-25.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-25.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index e0e39507..00000000
--- a/swamid-2.0/nya-25.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-25.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPmPWwhZBr5bMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ0WhcNMjEwMjI3MTYyODQ0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALRqVYZb+AO+i0F6wLlZHlCsa+umtgklRNIdnL0QAYbM43D9iADkxAxzpFsPC6ZjHcy6558ais/mNCXfGtGcVRECAwEAAaN/MH0wHQYDVR0OBBYEFNBCF+sf0xRGPoa0nvej/sz9OG6bME4GA1UdIwRHMEWAFNBCF+sf0xRGPoa0nvej/sz9OG6boSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA+Y9bCFkGvlswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJKJpOrx90DSEFuzxrz5JgBZWU9FmwlIX1xs0Wptkwf7hpjFXvAAdnrU1YWHf5SWyQucVDqCAYT8BQLB0yujc+s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-25.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPmPWwhZBr5bMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ0WhcNMjEwMjI3MTYyODQ0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALRqVYZb+AO+i0F6wLlZHlCsa+umtgklRNIdnL0QAYbM43D9iADkxAxzpFsPC6ZjHcy6558ais/mNCXfGtGcVRECAwEAAaN/MH0wHQYDVR0OBBYEFNBCF+sf0xRGPoa0nvej/sz9OG6bME4GA1UdIwRHMEWAFNBCF+sf0xRGPoa0nvej/sz9OG6boSKkIDAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlggkA+Y9bCFkGvlswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJKJpOrx90DSEFuzxrz5JgBZWU9FmwlIX1xs0Wptkwf7hpjFXvAAdnrU1YWHf5SWyQucVDqCAYT8BQLB0yujc+s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 49a81b31..00000000
--- a/swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-26.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALp4R33XExfvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTE3WhcNMjExMjEz
-MTQxNTE3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqX2WYVXnZ96yShE0LWkOazS1RSJCkDVJ
-lyBMVBkt/Lo+N9iCgbCqRI2/evcF8OLBt5qy8pk97LZDh6Wy3qXtIXooEiUWH2pH
-iHsQQOCEa+YRIUE5L70ZamRG/AeoqpXBwnAfk1OUy1i+B7NO7uZt4VX9Y3Ttazb4
-6njnuWaNcVPCQo3HPfSaTeu76bx8ell97T0x4biYUi4/UcMDqQSrHXPyTDmCqcft
-4u2LZtJftFoialBPZErISoxs2Eyuky4xjQL2UH8CK0ro2Xx62T+6AOKd1kNoSFN/
-bztW/5M3+GNQtCZvDUKr/qt6lElMYbNR+1JhIZJsLGVZylmAzHJfuwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjYubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTjXrOVbu1q1pc9HAtK
-FTf5reWyrDANBgkqhkiG9w0BAQUFAAOCAQEAcKjLV9sBDcLAYXLmnrtqpOZB+z48
-iF3UIn+kdWSL8zvnic5XlaK5zUYPQe76gICzDYXSCEYX5cidtliNvx21X2BjHM0Q
-mqU+DAtx2jMwib7Q3bG+5T8dX0D35/9vbak4EeLApAL1TkNq4NCCoqNqvYWE1fHo
-dyF+YgxLywhY4sZwz+KURwPeIqrqA7IYwb4uBtF9P0Gn9w5xfz5ujtAfUZKyhjma
-8vh/0Jzd+DEPKaqHGtsHQEPjhXP7ZqK5PAnAJ6CorBK4FgJu/EOGTcC3A4MXEoYq
-EN4xy84V9WE+bDj8Xp32IHk94hqWVgyHdCSTn37MxRLuMwE/Nof5YXRdSg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index a672c28d..00000000
--- a/swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-26.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJMRJTWdT+jWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ1WhcNMjEwMjI3
-MTYyODQ1WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrut6VJJxu/wcH5cSjEE3/IgejRNbDTf
-NM9UKz3bnQ25n6TCP9NWD4VrlSArf/tvJU8FrvFE0DWg3pXy+HZriUwGVWOspLhF
-in97AiIw0rElvpCf1O5p4PBRBAXwe/Ron8K4NX64mynVI5UA8jT+LozeprLHuDOA
-R5Mqen22fYsqxxDa30s9qdmU70eexM8BnwLbebDfJ+8tkjxdyYwp6JvZXJW9h9ht
-O9rXUJcXDjNBAW0Kj3iRE0KddC34mukFU0utGc8aNbxAEC1V/mAr0UbQemnI1IRE
-/4Oa8p09lbbPDeU16JzasJwHqzmqEhh+H6aekj7n//QObE7MaDJo/wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSqPLWo77i+bj3oT8WfSidc
-6B4G4DANBgkqhkiG9w0BAQUFAAOCAQEAkxnvzAFJbs1U1INVh+eA44P4S7vFsyW7
-nCsUsRQHNW7AtmrDNURRVgnbni+tCzpDfKJP+V8x8tAKSwA4x12NMCUiW7blAeNO
-aJa8AXHmX8hOlLl/UGwlXqersvJaSb9WkaVyhdeRCHugmH+f8Qz5m8pBDm5zMRgc
-TOUzUhrC3aYqfm3nuCcReB3yn1LpyKe5oGzUBvrDAtME7XM87mc4w3tJRCnp8HX7
-IEaSCtshej7lX+OeaisnalaocNYgiCOKQg3GSmP6R3pfchjZd/bJaCfHGXSI/gMd
-9hnnNk0rP0HZsyJNtCXezQxMoznT2V9XmkuNr1rKfgSNaSTQ6MW/wQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-26.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJMRJTWdT+jWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ1WhcNMjEwMjI3
-MTYyODQ1WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrut6VJJxu/wcH5cSjEE3/IgejRNbDTf
-NM9UKz3bnQ25n6TCP9NWD4VrlSArf/tvJU8FrvFE0DWg3pXy+HZriUwGVWOspLhF
-in97AiIw0rElvpCf1O5p4PBRBAXwe/Ron8K4NX64mynVI5UA8jT+LozeprLHuDOA
-R5Mqen22fYsqxxDa30s9qdmU70eexM8BnwLbebDfJ+8tkjxdyYwp6JvZXJW9h9ht
-O9rXUJcXDjNBAW0Kj3iRE0KddC34mukFU0utGc8aNbxAEC1V/mAr0UbQemnI1IRE
-/4Oa8p09lbbPDeU16JzasJwHqzmqEhh+H6aekj7n//QObE7MaDJo/wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSqPLWo77i+bj3oT8WfSidc
-6B4G4DANBgkqhkiG9w0BAQUFAAOCAQEAkxnvzAFJbs1U1INVh+eA44P4S7vFsyW7
-nCsUsRQHNW7AtmrDNURRVgnbni+tCzpDfKJP+V8x8tAKSwA4x12NMCUiW7blAeNO
-aJa8AXHmX8hOlLl/UGwlXqersvJaSb9WkaVyhdeRCHugmH+f8Qz5m8pBDm5zMRgc
-TOUzUhrC3aYqfm3nuCcReB3yn1LpyKe5oGzUBvrDAtME7XM87mc4w3tJRCnp8HX7
-IEaSCtshej7lX+OeaisnalaocNYgiCOKQg3GSmP6R3pfchjZd/bJaCfHGXSI/gMd
-9hnnNk0rP0HZsyJNtCXezQxMoznT2V9XmkuNr1rKfgSNaSTQ6MW/wQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-26.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-26.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index c766aed7..00000000
--- a/swamid-2.0/nya-26.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-26.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJrjFsP2UlpEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO4hpA262RckfWkz2d90dqhIXmMrC9dGS+Sc0uABbWIOGUmAgGK8NA95N0fs1aIeRQm4lq3uI/TtVpyJL6y7kJkCAwEAAaN/MH0wHQYDVR0OBBYEFBX5OAmlsWbotOOwEjLCZh/04ziIME4GA1UdIwRHMEWAFBX5OAmlsWbotOOwEjLCZh/04ziIoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAmuMWw/ZSWkQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUXiG3pdRurQu+NHg5belX8wMno8A+TUEkxvENQYK5H0+OApYPJYXyO/KX4oEnpZSGwC0A+B40agW+OkwQEgOk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-26.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJrjFsP2UlpEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO4hpA262RckfWkz2d90dqhIXmMrC9dGS+Sc0uABbWIOGUmAgGK8NA95N0fs1aIeRQm4lq3uI/TtVpyJL6y7kJkCAwEAAaN/MH0wHQYDVR0OBBYEFBX5OAmlsWbotOOwEjLCZh/04ziIME4GA1UdIwRHMEWAFBX5OAmlsWbotOOwEjLCZh/04ziIoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAmuMWw/ZSWkQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUXiG3pdRurQu+NHg5belX8wMno8A+TUEkxvENQYK5H0+OApYPJYXyO/KX4oEnpZSGwC0A+B40agW+OkwQEgOk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 97ae5712..00000000
--- a/swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-26.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALIodwWlcbtrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2HW4IkbgdC4U7/yvKtMzRlyXzTvIca7AG28YkjBfzpbu3PwD3+/dARQCHXcxgTTYkYnaFmJtLxTx++sz41lDcCAwEAAaN/MH0wHQYDVR0OBBYEFJfRBr2HdPlaqxQjK8CG20hS8RTLME4GA1UdIwRHMEWAFJfRBr2HdPlaqxQjK8CG20hS8RTLoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAsih3BaVxu2swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEoME8x05cIOFRjKag4PBodOUU9eGUXlZvRnTaldZklVaZ4CFYkpRtlzt2Yl7mSZPKLA1omU07s8h7hd8Cx0qnk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-26.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJALIodwWlcbtrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2HW4IkbgdC4U7/yvKtMzRlyXzTvIca7AG28YkjBfzpbu3PwD3+/dARQCHXcxgTTYkYnaFmJtLxTx++sz41lDcCAwEAAaN/MH0wHQYDVR0OBBYEFJfRBr2HdPlaqxQjK8CG20hS8RTLME4GA1UdIwRHMEWAFJfRBr2HdPlaqxQjK8CG20hS8RTLoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAsih3BaVxu2swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEoME8x05cIOFRjKag4PBodOUU9eGUXlZvRnTaldZklVaZ4CFYkpRtlzt2Yl7mSZPKLA1omU07s8h7hd8Cx0qnk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8452/idp/profile/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/nya-26.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-26.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 176bdb3e..00000000
--- a/swamid-2.0/nya-26.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-26.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-26.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANPMHs+BB/iEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3
-MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDedjUfQw5R3giUe3QQtdOcPm7nPSQh0
-OmMCaLEyjBhPx48lnT5MK+2zVeUK8L82C+MKkGYTjO2JP7uk0VfIlms1LgdmkNK7
-M6Qfyd2C9JJJK+xNoejf/hreMZ0/KU47x5UlS502tFzuXSnau/07GwEzbjX6qWMc
-o1PExvlVaL12308w3RqtnOXo9Gv6vPvUmb6/GwIr6ASC1IGXE3FSBAZc32IJGHcO
-BG5EuM61UpPd5j/emZVgDN0+GaUDT8cm7NiqWYfacPyay1+ddnsNX+viYtAPeWzR
-QxwYQe662E1OEKAmyvGf2+YZF1aShseIJcyZFVx4fnQ/MAhRD5CdHwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRxs9AFvhAkl0y6Oi2rUERQ
-PE+JTjANBgkqhkiG9w0BAQUFAAOCAQEAYYKQmoM4/5D1f9jQTGBF+bvxFKLsL//F
-ZnsxU3m2QQhXE/So/i6bSo0hW6OOndllcM4QZg5ElhgS7UxUd2cUtIDq3k1AtPqM
-MC4bAHUU87jb3wJ1jUkGEGSdj0W4ZrG3N0D0TOzEXFu8oIM9cDJg43nN9DfznTHT
-7/3BYhHHxboTA/ZmXtRKnAmSTeeRmd8r6soxgGjLOCn53XqF+7P89jjgUzrrq0kB
-yzfEuj5Sg+l4mvUJ7qjUVBIHMK282Qez/xYl/svOKFZKRh6/6MYn8wCUlICIPEYB
-90YPkBD99DRXnjFWk9l30fyTCYcxuofuoOj5u8/VWIXvgoi75dmgiw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-26.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANPMHs+BB/iEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ2WhcNMjEwMjI3
-MTYyODQ2WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDedjUfQw5R3giUe3QQtdOcPm7nPSQh0
-OmMCaLEyjBhPx48lnT5MK+2zVeUK8L82C+MKkGYTjO2JP7uk0VfIlms1LgdmkNK7
-M6Qfyd2C9JJJK+xNoejf/hreMZ0/KU47x5UlS502tFzuXSnau/07GwEzbjX6qWMc
-o1PExvlVaL12308w3RqtnOXo9Gv6vPvUmb6/GwIr6ASC1IGXE3FSBAZc32IJGHcO
-BG5EuM61UpPd5j/emZVgDN0+GaUDT8cm7NiqWYfacPyay1+ddnsNX+viYtAPeWzR
-QxwYQe662E1OEKAmyvGf2+YZF1aShseIJcyZFVx4fnQ/MAhRD5CdHwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjYubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRxs9AFvhAkl0y6Oi2rUERQ
-PE+JTjANBgkqhkiG9w0BAQUFAAOCAQEAYYKQmoM4/5D1f9jQTGBF+bvxFKLsL//F
-ZnsxU3m2QQhXE/So/i6bSo0hW6OOndllcM4QZg5ElhgS7UxUd2cUtIDq3k1AtPqM
-MC4bAHUU87jb3wJ1jUkGEGSdj0W4ZrG3N0D0TOzEXFu8oIM9cDJg43nN9DfznTHT
-7/3BYhHHxboTA/ZmXtRKnAmSTeeRmd8r6soxgGjLOCn53XqF+7P89jjgUzrrq0kB
-yzfEuj5Sg+l4mvUJ7qjUVBIHMK282Qez/xYl/svOKFZKRh6/6MYn8wCUlICIPEYB
-90YPkBD99DRXnjFWk9l30fyTCYcxuofuoOj5u8/VWIXvgoi75dmgiw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-26.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-26.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 3cf0584b..00000000
--- a/swamid-2.0/nya-26.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-26.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM4bezV2IpuzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ3WhcNMjEwMjI3MTYyODQ3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8VHy0CbGSb2QnE26Ztpkb8ZDnM9VlWC3vblii0+WsA8YGG8go2T3lk6qIizBiGE0SGykUskuujUeRsN0iMvN0CAwEAAaN/MH0wHQYDVR0OBBYEFOFFdextZDqDy1Pg0ivtW273SypqME4GA1UdIwRHMEWAFOFFdextZDqDy1Pg0ivtW273SypqoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAzht7NXYim7MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA2jhEZ51yTjR5IXOgAI4Gyi6Mp58wd0aBLOCYtCiuCYPkt1YkkjHmDypBS59gwhsKsCuBFhwv9bOHEvtiNQ37g=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-26.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM4bezV2IpuzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ3WhcNMjEwMjI3MTYyODQ3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8VHy0CbGSb2QnE26Ztpkb8ZDnM9VlWC3vblii0+WsA8YGG8go2T3lk6qIizBiGE0SGykUskuujUeRsN0iMvN0CAwEAAaN/MH0wHQYDVR0OBBYEFOFFdextZDqDy1Pg0ivtW273SypqME4GA1UdIwRHMEWAFOFFdextZDqDy1Pg0ivtW273SypqoSKkIDAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlggkAzht7NXYim7MwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAA2jhEZ51yTjR5IXOgAI4Gyi6Mp58wd0aBLOCYtCiuCYPkt1YkkjHmDypBS59gwhsKsCuBFhwv9bOHEvtiNQ37g=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-27.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-27.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index a6a12be3..00000000
--- a/swamid-2.0/nya-27.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-27.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALGgkF8L25q1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTIxWhcNMjExMjEz
-MTQxNTIxWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx7rtdp2Cx4AKhlVyWSmN15ybY+0Uno0Q
-oeDDXivhnCpYuP6EcvIHxfYz7pEfoSGRopnUXptk76npG32FQ9OtaNbhyIB3SfnI
-t/q0qmOxb/NrDTxpiZ7QaSepoChqEqpkq06p7Nz9BUqsK3xPwOi7Lk7OP/cJIAXw
-SFnDSszsXLHeO32wcXf/+uaSY5NAs5dO5iWCMBOPXJFCjl6nWYs7q/bBRuEzfePm
-sA5ysRKMUiX+Pq1gwLXruYcckKpRSUrNHlo/B6F0Q2KogxuXZ07cawJGyJ5QEWDI
-y5fRdAcdPx1YRT0Ne6DuWVd3+8hWWlfXGSzZLb9J3uPXqhXqgr6LLQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjcubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRev4uOq1I1JvonCzvd
-4wIfqljv3TANBgkqhkiG9w0BAQUFAAOCAQEAsebc0n0S1X+W4dVO/0emXYTPiTqf
-RlMYwGjXjN6kL3k5YFs2SJWheWEhijLvT9McW9IEjwNzT6cwusLbeByt5LAvSYp5
-VKctoYYX12R02mVzb7UqedZuk9IjQcbk9xE33eon7hRPMMJb0J9Ufhc1dc+YiX6C
-Ej55514mjxFrJdumeRDwKqXy3Cmt+bCN5G+C2pGCbj3gHvx9zu14WQ8ZT8h5xECI
-ETaOlrpoU2YACKyWj3WHyqcJnTxZ7pd1B4AK9TI3JJCeKL1/piP6X2U9ScZSK2ML
-w/LR6BjPRnidomTdbMUJtuZ2Vy9f/A2PX8xz1VnJ1FwMsYZ04t7tL//jww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-27.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-27.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 03f8a876..00000000
--- a/swamid-2.0/nya-27.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-27.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALHFla5Pd3q9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ4WhcNMjEwMjI3
-MTYyODQ4WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxehiiW8zzkPYD7YT7KeX1Wj2nQSzEWg
-AqgnRe9AhCXFPrc6xqAo6VSiynSxT6XW7wGqxHwBrrgSFc9jy3QnfIEasPawPqdm
-VfYHAPTQLN1B+5M/i14AauoTphlVeAOi0z7uv8dMoNTRuuUvblUuUb+J+hiTrgwn
-oD29FJAWS3vzEyjDWr4JyXuhJbsZSbL5NDlE9XbTfQ0+j98BUayd1gyyQkotBReT
-WKGmqcoCPrboM1wibxb4jWURP6+UR9nE75Ul3Z7fiAs9b5QVFAdTq+FcraL0Ixjt
-R5uNGBnr3pKnuhZLXPvOSDAFYtHJcNMi5W1zE8r54rJOSIt5JR6LUQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQRQsg7ssya95IY2+UIfzen
-HkT2EzANBgkqhkiG9w0BAQUFAAOCAQEAknvLf7/nlFjkiKP3BTTxveI02q6LmbHz
-h/6+eh1kEUMixYXplWaZ75pllOjocVEaPLksaHUAt+8oOIp0XurncdD6ZhjKyQBc
-49JpvdW1HFvw39L0omp2GIbcchtWPJR59bFUT7ej4H2/0Xay0bQ34QyJwK3Y4btf
-JAlDMUQIK98uWVL31UcmB5jasWzPLfhaj5xD7mJlMPVuAIeenvtKtPGUFaKMsUO9
-QIDhp5uY4xIwTrVw4Hao1lkAIKeJcELSoEfiyPAYaukbM+NqXrscO1ggwlUi7wi3
-UMYlJQdprstMpBqDZw7DmjrPz62SbdnakbXUfAg0x6uOXlVtcv0iOQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-27.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALHFla5Pd3q9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ4WhcNMjEwMjI3
-MTYyODQ4WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxehiiW8zzkPYD7YT7KeX1Wj2nQSzEWg
-AqgnRe9AhCXFPrc6xqAo6VSiynSxT6XW7wGqxHwBrrgSFc9jy3QnfIEasPawPqdm
-VfYHAPTQLN1B+5M/i14AauoTphlVeAOi0z7uv8dMoNTRuuUvblUuUb+J+hiTrgwn
-oD29FJAWS3vzEyjDWr4JyXuhJbsZSbL5NDlE9XbTfQ0+j98BUayd1gyyQkotBReT
-WKGmqcoCPrboM1wibxb4jWURP6+UR9nE75Ul3Z7fiAs9b5QVFAdTq+FcraL0Ixjt
-R5uNGBnr3pKnuhZLXPvOSDAFYtHJcNMi5W1zE8r54rJOSIt5JR6LUQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQRQsg7ssya95IY2+UIfzen
-HkT2EzANBgkqhkiG9w0BAQUFAAOCAQEAknvLf7/nlFjkiKP3BTTxveI02q6LmbHz
-h/6+eh1kEUMixYXplWaZ75pllOjocVEaPLksaHUAt+8oOIp0XurncdD6ZhjKyQBc
-49JpvdW1HFvw39L0omp2GIbcchtWPJR59bFUT7ej4H2/0Xay0bQ34QyJwK3Y4btf
-JAlDMUQIK98uWVL31UcmB5jasWzPLfhaj5xD7mJlMPVuAIeenvtKtPGUFaKMsUO9
-QIDhp5uY4xIwTrVw4Hao1lkAIKeJcELSoEfiyPAYaukbM+NqXrscO1ggwlUi7wi3
-UMYlJQdprstMpBqDZw7DmjrPz62SbdnakbXUfAg0x6uOXlVtcv0iOQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-27.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-27.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 621891b4..00000000
--- a/swamid-2.0/nya-27.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-27.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANYI7Xy4b7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQZjG87MJxX/u39xd3ntIf+Kbw1HnwedEQtrEXBGvY+QUxrVvb9lU3NwXJg68NyjyLAZUozZ/ctRGe59Ao6Y6kCAwEAAaN/MH0wHQYDVR0OBBYEFHK1spBTknKBFa1BEnuP/vAFJBHcME4GA1UdIwRHMEWAFHK1spBTknKBFa1BEnuP/vAFJBHcoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkA1gjtfLhvs6IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC/cJyvjSAZAQwq9XhuR8oEH2EzFJJUxAtXhG99q7tS5TzaPWduAcoeLDpz7LUP1BcsfbyM8C3eVLNAUPtNF5eU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-27.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANYI7Xy4b7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQZjG87MJxX/u39xd3ntIf+Kbw1HnwedEQtrEXBGvY+QUxrVvb9lU3NwXJg68NyjyLAZUozZ/ctRGe59Ao6Y6kCAwEAAaN/MH0wHQYDVR0OBBYEFHK1spBTknKBFa1BEnuP/vAFJBHcME4GA1UdIwRHMEWAFHK1spBTknKBFa1BEnuP/vAFJBHcoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkA1gjtfLhvs6IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAC/cJyvjSAZAQwq9XhuR8oEH2EzFJJUxAtXhG99q7tS5TzaPWduAcoeLDpz7LUP1BcsfbyM8C3eVLNAUPtNF5eU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index f68ce447..00000000
--- a/swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-27.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAINV/iQSKFgUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJbUABs7+6wYvQFpBmJRTFaOHV107KtTiZw70DNoKqvFZpGiV3S9xScZqfMCETTehtNuER4c3bqZkVO27ktO3+sCAwEAAaN/MH0wHQYDVR0OBBYEFKcAy1Hd7uOIoANnC1OHj8P7GmHgME4GA1UdIwRHMEWAFKcAy1Hd7uOIoANnC1OHj8P7GmHgoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAg1X+JBIoWBQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABwrUOgg9pOMvvrk3PYNxe9ZUu4sp1aUtrpYYO5ND7ZGYmpJBwFWcpfN7XuXe/fLfckzIEoZQeQOGHUufP+hm2s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-27.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAINV/iQSKFgUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJbUABs7+6wYvQFpBmJRTFaOHV107KtTiZw70DNoKqvFZpGiV3S9xScZqfMCETTehtNuER4c3bqZkVO27ktO3+sCAwEAAaN/MH0wHQYDVR0OBBYEFKcAy1Hd7uOIoANnC1OHj8P7GmHgME4GA1UdIwRHMEWAFKcAy1Hd7uOIoANnC1OHj8P7GmHgoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAg1X+JBIoWBQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABwrUOgg9pOMvvrk3PYNxe9ZUu4sp1aUtrpYYO5ND7ZGYmpJBwFWcpfN7XuXe/fLfckzIEoZQeQOGHUufP+hm2s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8452/idp/profile/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/nya-27.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-27.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 7195e058..00000000
--- a/swamid-2.0/nya-27.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-27.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-27.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIb7sNmCeZ9HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ5WhcNMjEwMjI3
-MTYyODQ5WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqaix7VzfErBfxZvClLBK3uWZaZz1gkb5
-yLvFfDIfIJR1ms4SqCt7aZ78bDK2XKrQOyZXz2I9jrdZxpp4MkOLGCVp3UFlqOEJ
-mjapDGiF+jyMCsBymxXqns849PD37WofXoyP7rLZBHoI5WtULoQa1z9JDxMYdtXZ
-2yrzN2lsvoc3GsN83SG221xeEydbABTejWuxq9PqIyOsX8dYQ4ZP+I8l240rzDXu
-Mf0fw/ZqzieS0tekoVpW4OjbQK59e78ISOio7FhBwe0nabwAQzqGJp8TMuX2ATjd
-bv1fkUXcVoHmaO1DQfOS6sKrw0Yj/bVPs6+FOopQhRJWDEb7VZCJ4wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRTJ5TokjcggHqTRb8jVrma
-2qeHMzANBgkqhkiG9w0BAQUFAAOCAQEAfboJ6PyjaCG3TBr/sA7MLX8J8TY6kYzp
-KFb+lS9T9MRr41DwinZAIUsYqqLmH9tB0Jo5h6RGbGrHMvPqoAZBW/IXIAVSd9p3
-Ak5rNtRr35weTIes0fN691W6YjQAESapQ6Du2l6ijMvNlNTLQbXiZE+bKzzJtvcB
-t8gnaRgtnv6iicShmpgkS/KuIR+ATXZjyxAQBWZnlrz4jT1/ueBrdqAwdpfosWTu
-utY5wItm3TQJRshv2a82m7ftAbviuB6cxTo/1RGQPQ/hb4Es8I+LqWR5TSnyfX8e
-MhVUSmaP3/KoWvbJ1UJ/pPl9RGufT50br0mnYMGI+bjUX2c8JJbzlg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-27.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIb7sNmCeZ9HMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQ5WhcNMjEwMjI3
-MTYyODQ5WjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqaix7VzfErBfxZvClLBK3uWZaZz1gkb5
-yLvFfDIfIJR1ms4SqCt7aZ78bDK2XKrQOyZXz2I9jrdZxpp4MkOLGCVp3UFlqOEJ
-mjapDGiF+jyMCsBymxXqns849PD37WofXoyP7rLZBHoI5WtULoQa1z9JDxMYdtXZ
-2yrzN2lsvoc3GsN83SG221xeEydbABTejWuxq9PqIyOsX8dYQ4ZP+I8l240rzDXu
-Mf0fw/ZqzieS0tekoVpW4OjbQK59e78ISOio7FhBwe0nabwAQzqGJp8TMuX2ATjd
-bv1fkUXcVoHmaO1DQfOS6sKrw0Yj/bVPs6+FOopQhRJWDEb7VZCJ4wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjcubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRTJ5TokjcggHqTRb8jVrma
-2qeHMzANBgkqhkiG9w0BAQUFAAOCAQEAfboJ6PyjaCG3TBr/sA7MLX8J8TY6kYzp
-KFb+lS9T9MRr41DwinZAIUsYqqLmH9tB0Jo5h6RGbGrHMvPqoAZBW/IXIAVSd9p3
-Ak5rNtRr35weTIes0fN691W6YjQAESapQ6Du2l6ijMvNlNTLQbXiZE+bKzzJtvcB
-t8gnaRgtnv6iicShmpgkS/KuIR+ATXZjyxAQBWZnlrz4jT1/ueBrdqAwdpfosWTu
-utY5wItm3TQJRshv2a82m7ftAbviuB6cxTo/1RGQPQ/hb4Es8I+LqWR5TSnyfX8e
-MhVUSmaP3/KoWvbJ1UJ/pPl9RGufT50br0mnYMGI+bjUX2c8JJbzlg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-27.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-27.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index f7cc99e5..00000000
--- a/swamid-2.0/nya-27.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-27.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL53MgwuVHeVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANGJ01J22ZKMxFpcn8AxCnvIOA1BRt+usGNqXf9Z5KkndgpcfeHtIx+njay2nQ7Kc3v7+lxnj4OVq3sjgAFNNDUCAwEAAaN/MH0wHQYDVR0OBBYEFHYKFgvxlwh1LE8qbeU4n6mO+54OME4GA1UdIwRHMEWAFHYKFgvxlwh1LE8qbeU4n6mO+54OoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAvncyDC5Ud5UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJiWafcW56v6YB4nVrYA7l7W9z3oQVriCrleQVeRPZeBJf5niFe9Mwa/2R/zv5C4NebIQN7Pb6oLR15qCfe3tvU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-27.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL53MgwuVHeVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUwWhcNMjEwMjI3MTYyODUwWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANGJ01J22ZKMxFpcn8AxCnvIOA1BRt+usGNqXf9Z5KkndgpcfeHtIx+njay2nQ7Kc3v7+lxnj4OVq3sjgAFNNDUCAwEAAaN/MH0wHQYDVR0OBBYEFHYKFgvxlwh1LE8qbeU4n6mO+54OME4GA1UdIwRHMEWAFHYKFgvxlwh1LE8qbeU4n6mO+54OoSKkIDAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlggkAvncyDC5Ud5UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJiWafcW56v6YB4nVrYA7l7W9z3oQVriCrleQVeRPZeBJf5niFe9Mwa/2R/zv5C4NebIQN7Pb6oLR15qCfe3tvU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-28.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-28.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 7af09549..00000000
--- a/swamid-2.0/nya-28.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-28.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPzwtytwhm74MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTI1WhcNMjExMjEz
-MTQxNTI1WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwn2PbbtfIZKer0xGKKXnMfnTiBWV66zT
-WLpu3nKINu0+txyMNYb906zCOAPfg05xRgyiyTRQ46fUjolTvv9qRYYyTgKj+Cro
-IEVKwMIr9QUHNj80q+1jFYODzSHYvgNevNt7qeX4NYEos1wFt0fuebTJKo8Kk29m
-6nCtkf458lC39YPx2XZXyQPwoVRSS329q+iF06lpSqmQjPTldZddOlzT6wXaXrbI
-U7HtMZ5IYI5ybijoc+ys7TasNvRSTHEeq2Lndk739nxiyiIsvZ5HB/Rxzz9QTIhU
-v+nyfD/xetu7//l9xOSNwHaUSLyIa7h6OY6Cw7sdW5KXXZ60zQxN8QIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjgubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT34xaKadMSZngzCkfa
-Bd39b1D4KDANBgkqhkiG9w0BAQUFAAOCAQEAfNmRNfdHIOmZ8KcklShMyzLe+dOk
-leiR3TW1RxbsFXrWKlU7vCHwnhOllz9c0xGZoBMuXO7RMnwMCng2PcUfjNGrmk0r
-WFPMcaY5iW1Wa/NtTSxGpqGMJjb2q1rW49mLI2kzygvmg5v1kSkWiZJ43MLTAANN
-VQyXAkC0VL+iOe6std2STnDAQi5jvm4eJdmJuR+VhNaFtKtkgW2ikrp3fQVxhyvr
-Qiai6+3vTnVpY6vPb2GpmZ7Vg9i1p0h53YQTT3K19AcNoEERaWmyT2HkhbezB6Dk
-7LA8ePm+pfFNfBkR5dXSWJGnyG0aiLIK961zbmM5U7M9z4APEt+XTQVD+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index f6cab3af..00000000
--- a/swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-28.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANukgTJ/UqfnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUxWhcNMjEwMjI3
-MTYyODUxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2q7hl8tp4XMHOkh+SDalGBhbnasx5Mr/
-MSdOcvaJ2W6G+ipRD380xWc5+0k+ZGg8tG3PxwRJ78z+TYxwaxcNTsMSGulkQc9Q
-HQWE4xpF3p8GxY9DZPpV0VM+saCk0WfxGB5G/StzTdWisPJ1U4iToB8L1yc8m3/U
-Cs0oMBVisvr4oydXsh5FloDFic/vH9XCCulCyKn9dRoJK0MtbspGs4IYOKkxwLA3
-yf/A0OroWURqw1P3n7IIgC9blG/du9u33AZliYa7WkNYZWE7RUL1KVne58qMoCyd
-ITnUAb2MUueDQzBjj4xao8EgH/UOcLTcJAraKqtxHnZgQkGuPDme3QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQHe+vF9fqOJ4qdjHO5BPsU
-SipYDzANBgkqhkiG9w0BAQUFAAOCAQEAcZac+RHR1Z6XmQwyrSwC+FkZc/CtZbee
-2ToeJn9s7+DoltZBCw2ffMyYdIj4rVxOrLEwrWuTvNttL+z1tDrfyKZMHqu9FOL4
-urWdsYhThw+5D+CyR+9DD3I4PYn95yJgF933jGM+yD2/2z8paN8hlvE+uAYFvBjo
-zzQvIS/cX4YzUmLIRSZs+jx6zK75DuELMKy1tE2Muhck0GB2g2MO/3uL4xrAiNAu
-l26jHRksp7Q5PZWohHAuLyYxLwc9L7+hi8N7aUWF4WxIHxCOENU/8hKQn+ntr9h5
-lpKuCN+a4Gm0GAOQsh4RpV42hZ1KvNvEq+qIHaCv9hXWb6oNhYFpjw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-28.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANukgTJ/UqfnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUxWhcNMjEwMjI3
-MTYyODUxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2q7hl8tp4XMHOkh+SDalGBhbnasx5Mr/
-MSdOcvaJ2W6G+ipRD380xWc5+0k+ZGg8tG3PxwRJ78z+TYxwaxcNTsMSGulkQc9Q
-HQWE4xpF3p8GxY9DZPpV0VM+saCk0WfxGB5G/StzTdWisPJ1U4iToB8L1yc8m3/U
-Cs0oMBVisvr4oydXsh5FloDFic/vH9XCCulCyKn9dRoJK0MtbspGs4IYOKkxwLA3
-yf/A0OroWURqw1P3n7IIgC9blG/du9u33AZliYa7WkNYZWE7RUL1KVne58qMoCyd
-ITnUAb2MUueDQzBjj4xao8EgH/UOcLTcJAraKqtxHnZgQkGuPDme3QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQHe+vF9fqOJ4qdjHO5BPsU
-SipYDzANBgkqhkiG9w0BAQUFAAOCAQEAcZac+RHR1Z6XmQwyrSwC+FkZc/CtZbee
-2ToeJn9s7+DoltZBCw2ffMyYdIj4rVxOrLEwrWuTvNttL+z1tDrfyKZMHqu9FOL4
-urWdsYhThw+5D+CyR+9DD3I4PYn95yJgF933jGM+yD2/2z8paN8hlvE+uAYFvBjo
-zzQvIS/cX4YzUmLIRSZs+jx6zK75DuELMKy1tE2Muhck0GB2g2MO/3uL4xrAiNAu
-l26jHRksp7Q5PZWohHAuLyYxLwc9L7+hi8N7aUWF4WxIHxCOENU/8hKQn+ntr9h5
-lpKuCN+a4Gm0GAOQsh4RpV42hZ1KvNvEq+qIHaCv9hXWb6oNhYFpjw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-28.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-28.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 7572d351..00000000
--- a/swamid-2.0/nya-28.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-28.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJR1DnqzCZWWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK/Wxf7Jo4FhF1A/yIRPnLUoLHXMWFGO+4Zo6kreju+oJUwb86eoc/NvnRrmWdsvqmBxHVTssm6FxyhIIymx3fcCAwEAAaN/MH0wHQYDVR0OBBYEFA5ZAM53TrIy2YNBE8kg9ndGMOy4ME4GA1UdIwRHMEWAFA5ZAM53TrIy2YNBE8kg9ndGMOy4oSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAlHUOerMJlZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKCzFqiX53XaIapQhZS5xMzsaiIZJf4NzNL7/4i6WdFKnCYtpTYR/lQZwyked8IDO5IEggUulHXrPAMKcE270/E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-28.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJR1DnqzCZWWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK/Wxf7Jo4FhF1A/yIRPnLUoLHXMWFGO+4Zo6kreju+oJUwb86eoc/NvnRrmWdsvqmBxHVTssm6FxyhIIymx3fcCAwEAAaN/MH0wHQYDVR0OBBYEFA5ZAM53TrIy2YNBE8kg9ndGMOy4ME4GA1UdIwRHMEWAFA5ZAM53TrIy2YNBE8kg9ndGMOy4oSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAlHUOerMJlZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKCzFqiX53XaIapQhZS5xMzsaiIZJf4NzNL7/4i6WdFKnCYtpTYR/lQZwyked8IDO5IEggUulHXrPAMKcE270/E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index a79d1a76..00000000
--- a/swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-28.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANeJM4WjbeKQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALO0FY95nMVxjdro9sPe/3HTjFKKCYwz8Pw6yZz9NJ/zjKN4zX37K2HZ5/salsktOPer0YjHXh/g3wKHpWA6YMUCAwEAAaN/MH0wHQYDVR0OBBYEFJkpv5sTDi1X1X59yiW7qtMxdVUZME4GA1UdIwRHMEWAFJkpv5sTDi1X1X59yiW7qtMxdVUZoSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkA14kzhaNt4pAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHE3uOrqgdNkcX/een2kHpRpfTQJkZY/qcOp+/oEV21lB7JQEXIku1jIy87JJqN+jw+T48yq/ap6twaH6FaNwho=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-28.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJANeJM4WjbeKQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALO0FY95nMVxjdro9sPe/3HTjFKKCYwz8Pw6yZz9NJ/zjKN4zX37K2HZ5/salsktOPer0YjHXh/g3wKHpWA6YMUCAwEAAaN/MH0wHQYDVR0OBBYEFJkpv5sTDi1X1X59yiW7qtMxdVUZME4GA1UdIwRHMEWAFJkpv5sTDi1X1X59yiW7qtMxdVUZoSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkA14kzhaNt4pAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHE3uOrqgdNkcX/een2kHpRpfTQJkZY/qcOp+/oEV21lB7JQEXIku1jIy87JJqN+jw+T48yq/ap6twaH6FaNwho=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8452/idp/profile/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/nya-28.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-28.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index c9937825..00000000
--- a/swamid-2.0/nya-28.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-28.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-28.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO2pKnOJFYrHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3
-MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Zw/7BzwuIvK9LFXB/pKaEqmjZJHqUVv
-3FVAQivqoc4MkNBwY9vs60x5wjozrDFkzIBKmCv6I2pOCSJe06vy8SQRtpnRFNxC
-r13x5TjUDAbjkuXlHqqq43XU2X2HjzsiICc12FDv86lvhwGt3o9FPMhAWCWq8o2N
-hq+CiH/tYQZUJONudLSzdKpCd5KyzIeCN1pVvCbGxPiLbC74TFjqRUL2yHz9j5c1
-m6vD1wtXXWbmoy2J1i8zzoISfsMx6+JAxD0ml09INQTrJBR2fXBz6SDg2fy8JDkv
-pBB3H2edt2fZdneuKjRR2s/Z+QqdyNkX0iGNub2+CG/GfVybEEhoRQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQgEG3hxDthM6mVfMZQCRRw
-ZeZT0jANBgkqhkiG9w0BAQUFAAOCAQEAEq2OzV7g5BiF+oCnVvKmkfUnsIoj6mMD
-1ErkER/a/s1VozCXv5Q4P9oe336SDbstxac2vLLzEaq7/ZPAZuYEeT1BNmlNV6KY
-8e1i5QPEZge9LDZG3FpLGUh+yYJFAA2ITAr1jk1a3zPrAfmUpB3lrhBeoo73YaCb
-veggeeEPTPhxQpUyh2WBgQVn//91VQw0LEUvLQfm5Mp3PMXIwV+x06zgXo5+MaeK
-9Bo0py2m6TkKyxkB6ShU+MKbsxiyhVlF18cZIgBIbvS7aTq72QIaPz/c5FBCwPpD
-J/MEsrZ/KnERkfVq1Z6YyIU90KZCe496B5df6e70129rDGb1ZoMmDQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-28.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO2pKnOJFYrHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUzWhcNMjEwMjI3
-MTYyODUzWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Zw/7BzwuIvK9LFXB/pKaEqmjZJHqUVv
-3FVAQivqoc4MkNBwY9vs60x5wjozrDFkzIBKmCv6I2pOCSJe06vy8SQRtpnRFNxC
-r13x5TjUDAbjkuXlHqqq43XU2X2HjzsiICc12FDv86lvhwGt3o9FPMhAWCWq8o2N
-hq+CiH/tYQZUJONudLSzdKpCd5KyzIeCN1pVvCbGxPiLbC74TFjqRUL2yHz9j5c1
-m6vD1wtXXWbmoy2J1i8zzoISfsMx6+JAxD0ml09INQTrJBR2fXBz6SDg2fy8JDkv
-pBB3H2edt2fZdneuKjRR2s/Z+QqdyNkX0iGNub2+CG/GfVybEEhoRQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQgEG3hxDthM6mVfMZQCRRw
-ZeZT0jANBgkqhkiG9w0BAQUFAAOCAQEAEq2OzV7g5BiF+oCnVvKmkfUnsIoj6mMD
-1ErkER/a/s1VozCXv5Q4P9oe336SDbstxac2vLLzEaq7/ZPAZuYEeT1BNmlNV6KY
-8e1i5QPEZge9LDZG3FpLGUh+yYJFAA2ITAr1jk1a3zPrAfmUpB3lrhBeoo73YaCb
-veggeeEPTPhxQpUyh2WBgQVn//91VQw0LEUvLQfm5Mp3PMXIwV+x06zgXo5+MaeK
-9Bo0py2m6TkKyxkB6ShU+MKbsxiyhVlF18cZIgBIbvS7aTq72QIaPz/c5FBCwPpD
-J/MEsrZ/KnERkfVq1Z6YyIU90KZCe496B5df6e70129rDGb1ZoMmDQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-28.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-28.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 9f6b7fe0..00000000
--- a/swamid-2.0/nya-28.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-28.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALG8GCbbKR3tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU0WhcNMjEwMjI3MTYyODU0WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKXP4usOfBZt3SjtplXarM3x3XKkls8GIEF6sAVfA8qbir3VaMm5H9zG+VF+Rk71C8rcAGdEWZWCKxaNf2tHTVUCAwEAAaN/MH0wHQYDVR0OBBYEFHdZbjHYDhYiKgRAt0Lolt0EqldiME4GA1UdIwRHMEWAFHdZbjHYDhYiKgRAt0Lolt0EqldioSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAsbwYJtspHe0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAATAH/DLKWu6OcYR1Ab/VtOAiKOqq1CGTVsmZ7sGNWIhtd0KuSnvSplWz2WYOXqtWoUjmSzBnxRFwTLKwjbZBic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-28.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALG8GCbbKR3tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU0WhcNMjEwMjI3MTYyODU0WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKXP4usOfBZt3SjtplXarM3x3XKkls8GIEF6sAVfA8qbir3VaMm5H9zG+VF+Rk71C8rcAGdEWZWCKxaNf2tHTVUCAwEAAaN/MH0wHQYDVR0OBBYEFHdZbjHYDhYiKgRAt0Lolt0EqldiME4GA1UdIwRHMEWAFHdZbjHYDhYiKgRAt0Lolt0EqldioSKkIDAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlggkAsbwYJtspHe0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAATAH/DLKWu6OcYR1Ab/VtOAiKOqq1CGTVsmZ7sGNWIhtd0KuSnvSplWz2WYOXqtWoUjmSzBnxRFwTLKwjbZBic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-29.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-29.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 1805ce2b..00000000
--- a/swamid-2.0/nya-29.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-29.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPVtEU1D1aDuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTI4WhcNMjExMjEz
-MTQxNTI4WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoMhpwlDO7FbL3HgiYqbmRJzIzP2o8Ch8
-Cnfe2HXDsXP1L10Od9XwIs0RVU85PNswyj9bB1+WQd1b5JSCOXwcj3VQ2yTPyxNy
-B/YJwytRi/HJvZYO5r2XHpi8Rt1+LQwwtcudBxMXBaHGupTwgh8Gt6HmMwBt2SB2
-ssm6Db1bi3qdERvceKY+nGS6d5BkJc3UxAf9tJCFWigW43C/+ceQQ27faK0CkC9v
-ZpBevJLRHzHrI+gv+qfIMW4rW73la97YvpagUrxVEScUputAEdwmfG/5Aifbo+Sl
-loPm13iyN1YP21JibNmLkaiaKoFj3tAb/CEXr6bcD7qB0XZTvjcEuwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMjkubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
-OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTE4HuJOASJap2pMyBz
-Xib+WHoYlDANBgkqhkiG9w0BAQUFAAOCAQEAHcyvDfMN/UhcKt2r1jDs13L+e7I1
-aEfZrvAwzSi2UOK9Jg3kGO4moeha2MgdQ70kwMqMeoPYXz73TgrZLf30TVoovc32
-Fykdwb9wKJYQfR0UYgRWQOpSp0zYsCUFg9gD250+ZFZLrXANThfFUztMYO10weu/
-wvfGwE3pB39N1vS523kCuwUGe1+VyvMjw6kneE8zBmTiqq1nU9HxdBxBR3ts1i3T
-aOQdgfo/F5KcQt5ix1n/iOujO32UrgsCS/tXUp5zabjkAfkKzceQkBGFX1M71MTz
-l765hiZbT7NqcTuv5FWmDtQwLICRUb3aVwf3EQTMjrR4DiN6JqA6l/tEpg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-29.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-29.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 0aaab64d..00000000
--- a/swamid-2.0/nya-29.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-29.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM8GWsqcmzmxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU1WhcNMjEwMjI3
-MTYyODU1WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwGRXduq0Jt5J1m/zZpgW5c5Vhob7THbm
-pjcfLvFRNLSTXvNbJykI+3KtjIuQVscrJyc+dt4469XBJtJ2wFulYBYTgF4u3Y/S
-cJOjKZDtejAQf8B80/LGk9YlPWKqI8NF/QrNeKRayOR3tiWGO0pBEpwxV/ZXqe30
-G7lQh3fmxayHT36LmVP9zP9f/Esum1SF5s9FU4PilZ4XrJFvVh2hEbWOrydx94CC
-tb7pMQ9tvkZIa27Zq6IhvwJYI7WfEy0mCboV4FoAIFbKJ6pb3kEQsXCi3MaNqPo2
-pK7k39G2WPsydkpj2b4Z7oIqh5lKEaoXmIU2j5yJTKYzZqWbJXkxdQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRR1vszNdIXOOwKd5/CKxxW
-rUrm2DANBgkqhkiG9w0BAQUFAAOCAQEAbmA2M+PkT8PKaqThlrNpL+SsQldxRtsn
-bYGldjtuW0+xf90IB6GLsth/FitjDiyh27ItaJinK7po2jS+jKlz9k2YcL1kztKE
-GO7CjhBwuJnv5/HVotzjvdBroObNAuBvG7OhfVLFoucp2Gxwx4LKFFHgtCZckBK0
-eK6ZWCXWUB+hOFq+w8rwRjZILyd2oLrlR/6/6mbCz8SCZV7v1uZgV4iinl8U83cZ
-PWt1xwPpiSPpHOPBHYOHbQN/cgG+RYFZggn9/9U3bg8EE2xZBuQ6cgifp/QKOPn0
-WSAr3hODRncOjSgwOPKYRYaEZeAmgmG22vRFZuPCz/rdEjRGMwPcMw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-29.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM8GWsqcmzmxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU1WhcNMjEwMjI3
-MTYyODU1WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwGRXduq0Jt5J1m/zZpgW5c5Vhob7THbm
-pjcfLvFRNLSTXvNbJykI+3KtjIuQVscrJyc+dt4469XBJtJ2wFulYBYTgF4u3Y/S
-cJOjKZDtejAQf8B80/LGk9YlPWKqI8NF/QrNeKRayOR3tiWGO0pBEpwxV/ZXqe30
-G7lQh3fmxayHT36LmVP9zP9f/Esum1SF5s9FU4PilZ4XrJFvVh2hEbWOrydx94CC
-tb7pMQ9tvkZIa27Zq6IhvwJYI7WfEy0mCboV4FoAIFbKJ6pb3kEQsXCi3MaNqPo2
-pK7k39G2WPsydkpj2b4Z7oIqh5lKEaoXmIU2j5yJTKYzZqWbJXkxdQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRR1vszNdIXOOwKd5/CKxxW
-rUrm2DANBgkqhkiG9w0BAQUFAAOCAQEAbmA2M+PkT8PKaqThlrNpL+SsQldxRtsn
-bYGldjtuW0+xf90IB6GLsth/FitjDiyh27ItaJinK7po2jS+jKlz9k2YcL1kztKE
-GO7CjhBwuJnv5/HVotzjvdBroObNAuBvG7OhfVLFoucp2Gxwx4LKFFHgtCZckBK0
-eK6ZWCXWUB+hOFq+w8rwRjZILyd2oLrlR/6/6mbCz8SCZV7v1uZgV4iinl8U83cZ
-PWt1xwPpiSPpHOPBHYOHbQN/cgG+RYFZggn9/9U3bg8EE2xZBuQ6cgifp/QKOPn0
-WSAr3hODRncOjSgwOPKYRYaEZeAmgmG22vRFZuPCz/rdEjRGMwPcMw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-29.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-29.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index e7807dbc..00000000
--- a/swamid-2.0/nya-29.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-29.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOWhs0Zclv2xMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANf4fWbt3EosFuu/5SM5xJDiAcwSPMLWy0harbjZhN++OlZm0u+iGtzeYn13dBHeZ+NkTHuii1mFzNy+NIqY18cCAwEAAaN/MH0wHQYDVR0OBBYEFI1CppVf49AQoQenMNq2u8NqfAGIME4GA1UdIwRHMEWAFI1CppVf49AQoQenMNq2u8NqfAGIoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkA5aGzRlyW/bEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM4l+PQsxKxx9BymFE0Ft18FfhqDRm+bWaHwQdpbgufANubggkhnHn41ri39OF9XaFVoNWGXUGMfCsXrY2stwrk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-29.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOWhs0Zclv2xMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANf4fWbt3EosFuu/5SM5xJDiAcwSPMLWy0harbjZhN++OlZm0u+iGtzeYn13dBHeZ+NkTHuii1mFzNy+NIqY18cCAwEAAaN/MH0wHQYDVR0OBBYEFI1CppVf49AQoQenMNq2u8NqfAGIME4GA1UdIwRHMEWAFI1CppVf49AQoQenMNq2u8NqfAGIoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkA5aGzRlyW/bEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM4l+PQsxKxx9BymFE0Ft18FfhqDRm+bWaHwQdpbgufANubggkhnHn41ri39OF9XaFVoNWGXUGMfCsXrY2stwrk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index c6772b2b..00000000
--- a/swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-29.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMSohvi8ADwhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ1+DIqlqlcO8cgg6K4h9KQcdAg6Q60egvibxnj+VOzwn3+1q46ije6xWfx7SFgWyKWa7vXRwUmetACryB6M7p0CAwEAAaN/MH0wHQYDVR0OBBYEFCRpSjASI88Ducg7vpQ1G1qaI7leME4GA1UdIwRHMEWAFCRpSjASI88Ducg7vpQ1G1qaI7leoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAxKiG+LwAPCEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADDO84xSWqg8KBpduEsAwX8rgGrc6csLAehsA2gbDIkZBQGOJUF0iD6Iuv2iF38hBdOPoXHylOI1L8yhQMuZu8E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-29.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAMSohvi8ADwhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ1+DIqlqlcO8cgg6K4h9KQcdAg6Q60egvibxnj+VOzwn3+1q46ije6xWfx7SFgWyKWa7vXRwUmetACryB6M7p0CAwEAAaN/MH0wHQYDVR0OBBYEFCRpSjASI88Ducg7vpQ1G1qaI7leME4GA1UdIwRHMEWAFCRpSjASI88Ducg7vpQ1G1qaI7leoSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAxKiG+LwAPCEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADDO84xSWqg8KBpduEsAwX8rgGrc6csLAehsA2gbDIkZBQGOJUF0iD6Iuv2iF38hBdOPoXHylOI1L8yhQMuZu8E=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8452/idp/profile/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/nya-29.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-29.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 98ae6b27..00000000
--- a/swamid-2.0/nya-29.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-29.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-29.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANydui5JvJh8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU2WhcNMjEwMjI3
-MTYyODU2WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4pAggFJoG223o0gxSaKrDKaHoTebMFQl
-vBdYo6ZqwKFhaUujf1nJETcZZE0OVfx78Rmz6DN1uDSR9DkrW8DVTHt92T/UId64
-eCdGHo5aDMCNa+Gose5XmrcIQVbEZvsIDITjcfzBh/6VbnXRwimIY8h5uc8BNMp1
-iIeXj0gtF0JghYxvNw8t8QOO6eA5vvxegBYrnNJ2aMLKUP0U0APl/z21eU+FIpzH
-CRD15d55zSDhxGPF1M4NaQbIDkbu5SmBunZR+ZtcsD/FVsSrlBIvcBI6bu6UMR8p
-Rl1/EARosVfIwtm5PxcOWPEhBcCzBrlcMcPjl/FTFEqxY1B0o5rCNwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRiMLuDvoIYGyj8wlY4v1U8
-10auqjANBgkqhkiG9w0BAQUFAAOCAQEAsT13yBovis5OyG3XJ9MVSodU9ykXVj7U
-y6gRSIKu3nGhMLcaqz7HzXCfLdsS2KrOdXTSNseg84u4CNRXh2Zz2ki4ulCyWHk4
-SZCr8VN31QCiSpBnQPsasc6ZuC96Srnw+sgi/GyJdkfhZvGn8wzSnaXRwYSZyIF3
-Jay0US/IB+8h3pCRmArHoUPFjrT8ptpMBANca5dLjwKtcvBxTBvNX0l2Ypf6Goe8
-wAQ8fjs2p5rE+rkYvhSOefY27YcMcpYZtwsdpL9n1Azi2LAQOrmz+shNM059CgYb
-dPtbgXk/a3zwik/8RzmXndxF4O3D6ei/JpVhjCUj3fCXWjZzWq+4PQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-29.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANydui5JvJh8MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU2WhcNMjEwMjI3
-MTYyODU2WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4pAggFJoG223o0gxSaKrDKaHoTebMFQl
-vBdYo6ZqwKFhaUujf1nJETcZZE0OVfx78Rmz6DN1uDSR9DkrW8DVTHt92T/UId64
-eCdGHo5aDMCNa+Gose5XmrcIQVbEZvsIDITjcfzBh/6VbnXRwimIY8h5uc8BNMp1
-iIeXj0gtF0JghYxvNw8t8QOO6eA5vvxegBYrnNJ2aMLKUP0U0APl/z21eU+FIpzH
-CRD15d55zSDhxGPF1M4NaQbIDkbu5SmBunZR+ZtcsD/FVsSrlBIvcBI6bu6UMR8p
-Rl1/EARosVfIwtm5PxcOWPEhBcCzBrlcMcPjl/FTFEqxY1B0o5rCNwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMjkubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRiMLuDvoIYGyj8wlY4v1U8
-10auqjANBgkqhkiG9w0BAQUFAAOCAQEAsT13yBovis5OyG3XJ9MVSodU9ykXVj7U
-y6gRSIKu3nGhMLcaqz7HzXCfLdsS2KrOdXTSNseg84u4CNRXh2Zz2ki4ulCyWHk4
-SZCr8VN31QCiSpBnQPsasc6ZuC96Srnw+sgi/GyJdkfhZvGn8wzSnaXRwYSZyIF3
-Jay0US/IB+8h3pCRmArHoUPFjrT8ptpMBANca5dLjwKtcvBxTBvNX0l2Ypf6Goe8
-wAQ8fjs2p5rE+rkYvhSOefY27YcMcpYZtwsdpL9n1Azi2LAQOrmz+shNM059CgYb
-dPtbgXk/a3zwik/8RzmXndxF4O3D6ei/JpVhjCUj3fCXWjZzWq+4PQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-29.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-29.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index a9848f38..00000000
--- a/swamid-2.0/nya-29.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-29.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM/Q+hrMe4RBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOzGfJ60TVWonxdzQ/0w8+Ej/GSK303yN/+COVEjHEW8HGO5XwrFIEHooGL++vbkRIa9zLcmuosZHh5qrmY8Ne0CAwEAAaN/MH0wHQYDVR0OBBYEFPl1wdmk4P+yu/723gUvIYSdE70tME4GA1UdIwRHMEWAFPl1wdmk4P+yu/723gUvIYSdE70toSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAz9D6Gsx7hEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIY0hfnUmZDxqR0JllYFQfACT+sx6y7QLDaukGVvvAdSvVJbCk9mJpLaWaIDTB4AfTk1Q1alWVHOvepCbVyjvFc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-29.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM/Q+hrMe4RBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU3WhcNMjEwMjI3MTYyODU3WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOzGfJ60TVWonxdzQ/0w8+Ej/GSK303yN/+COVEjHEW8HGO5XwrFIEHooGL++vbkRIa9zLcmuosZHh5qrmY8Ne0CAwEAAaN/MH0wHQYDVR0OBBYEFPl1wdmk4P+yu/723gUvIYSdE70tME4GA1UdIwRHMEWAFPl1wdmk4P+yu/723gUvIYSdE70toSKkIDAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlggkAz9D6Gsx7hEEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIY0hfnUmZDxqR0JllYFQfACT+sx6y7QLDaukGVvvAdSvVJbCk9mJpLaWaIDTB4AfTk1Q1alWVHOvepCbVyjvFc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-30.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-30.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 0e4cb7ee..00000000
--- a/swamid-2.0/nya-30.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-30.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPwDUuBKBZDvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTMyWhcNMjExMjEz
-MTQxNTMyWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPEvC3RW9oHqfj1Y85u1k3rk0OK62Gad
-0dm6ZTsxJ7RNu3fnnjs1K6f1lYepncfS65t6X+h9d7pClkc/gEa+zoiNx2vqt3eX
-wPU0bYtAbvnaT7GO5NJBCXiKy5aWIRNqw0oCdxbEII9d7OXxzciChSTaGEN0aqY6
-xe8SxlzRwzuCVsG2mZcWGwgDYCOjnNpMiTq24X9xA8T55an/zUCQUaGIaAHcypnQ
-6bXgqgNaQj/Rjdx5Ujovm1PJn6NqeBLoz2VdLZXHZ5RC+/McoDH7UrE6REiXaIUj
-G+NEYD7eFAPy2DHLHQH7iFL6OKwlNBdS6cT7zZ2ZOSEG5qu+Bryu5wIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzAubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRmFnrhsZEWj2haep+a
-0AsWS0nEzDANBgkqhkiG9w0BAQUFAAOCAQEAPAQIu/4nJR5zNa+RC/9n/G5WyWs6
-76M5q5QUcSpITTFC/Zbnu5emoH4ePtiEHKJti16yFBty7K93zWagPhPEWQmmorg9
-MrlJ6uTUmuP/oRsrzXo90AWjV1x2BSI8R5Ug0ykSmPdhzbjaft9Vp+uYAjnrq39a
-zW4C2SOEz88i2AgLbCfKGbA2sBUOYdXmVlzUt6fhgA6SDSfZIYXM9ECOO48CqKOF
-6E5dv/3I+4J/mntCPEgMqThmYZ2vL3WNX1BDzGcXYSxQJpTNfwFALtOTc/u41NDA
-+6uuDtJBuxsBAiiwBI5EHk6vHo4pIFEyOekcHpNLVBPFHDayxmSxHQ0RmQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 804a19ff..00000000
--- a/swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-30.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMNd1ScqbllRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU4WhcNMjEwMjI3
-MTYyODU4WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6KU+c+CoR3+SoFgRLl4CnkEa3/AqMdTn
-FkfJGSjf96dgwnffTmvv6EmLyrsOg8jkFM4/Mjz/9TO4z8RRqGJHTgJK8TGve/+n
-AhxVGdPvoUsynk2MclH7MhzPBHdkiYDdtyOJCwER6YXTirIvLNEyrZlWyFSPTNoE
-0xOWEd+4AuUbUC0xdS6H0A9VpYGF2DN0KgJFFiutJm+ud8Zm3gNAp6cV/maJEt3H
-YjbYtxLnDfJLzY6E4Qxf4ke1xz1VqhT1j7M/+NYb+zezS2dUtlLK4cvBO3bMyuwz
-FdapV7vv1tP+aXopA3ZaRsy5GcFY0zG7nAq1r4f3M0x4l2HErqjdawIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBT98XvKkDyfqY3JUHqVKD15
-coPVUTANBgkqhkiG9w0BAQUFAAOCAQEAaPoG+HDhkqRh2aJp9aR4jp5NRYDNH4Sx
-Qlon8dHQQ7a2HmaIXNOfylCCpj94JdBC1nh8V0RvDMmNwntKi+NgzBF2yX/5CQbQ
-gVNOVvoycPYWAd8PjRUsqZOgYngu3pqQ3f1ggHE3Ja3AtMQf/V2KiQGp9xgewqUG
-gyY2dgGyzEFQPty9GaB8GI98Vg2gN4V7vW/2GbUo+ygn5+AzaNKX6M3LCZ0Dzb0s
-Laj4dZXOB7DCaqioXTJ2jBets1VNaSlrKqbDzL613Qw85qAdegE+ArVUNGPDBP+e
-fu+NS3DQCM8W/DUtyPBzIKRfEBXjcpZaL5iD2xmr+MEDPQ5oGoBRRQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-30.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMNd1ScqbllRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU4WhcNMjEwMjI3
-MTYyODU4WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6KU+c+CoR3+SoFgRLl4CnkEa3/AqMdTn
-FkfJGSjf96dgwnffTmvv6EmLyrsOg8jkFM4/Mjz/9TO4z8RRqGJHTgJK8TGve/+n
-AhxVGdPvoUsynk2MclH7MhzPBHdkiYDdtyOJCwER6YXTirIvLNEyrZlWyFSPTNoE
-0xOWEd+4AuUbUC0xdS6H0A9VpYGF2DN0KgJFFiutJm+ud8Zm3gNAp6cV/maJEt3H
-YjbYtxLnDfJLzY6E4Qxf4ke1xz1VqhT1j7M/+NYb+zezS2dUtlLK4cvBO3bMyuwz
-FdapV7vv1tP+aXopA3ZaRsy5GcFY0zG7nAq1r4f3M0x4l2HErqjdawIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBT98XvKkDyfqY3JUHqVKD15
-coPVUTANBgkqhkiG9w0BAQUFAAOCAQEAaPoG+HDhkqRh2aJp9aR4jp5NRYDNH4Sx
-Qlon8dHQQ7a2HmaIXNOfylCCpj94JdBC1nh8V0RvDMmNwntKi+NgzBF2yX/5CQbQ
-gVNOVvoycPYWAd8PjRUsqZOgYngu3pqQ3f1ggHE3Ja3AtMQf/V2KiQGp9xgewqUG
-gyY2dgGyzEFQPty9GaB8GI98Vg2gN4V7vW/2GbUo+ygn5+AzaNKX6M3LCZ0Dzb0s
-Laj4dZXOB7DCaqioXTJ2jBets1VNaSlrKqbDzL613Qw85qAdegE+ArVUNGPDBP+e
-fu+NS3DQCM8W/DUtyPBzIKRfEBXjcpZaL5iD2xmr+MEDPQ5oGoBRRQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-30.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-30.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 537d8b0d..00000000
--- a/swamid-2.0/nya-30.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-30.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOACtXKgbo9wMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM36igm4DOMivZpWFyIX9cJ758aVMIt5Gt1600sDxiy+jqdJqVxAn6q7l0hs7yeOuv5KudBqo9RPKqmm8m33tnsCAwEAAaN/MH0wHQYDVR0OBBYEFKGhyw2EmFJeU01IHvvDGun3/2H0ME4GA1UdIwRHMEWAFKGhyw2EmFJeU01IHvvDGun3/2H0oSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA4AK1cqBuj3AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGCKsGmCULIdk1GzIERKT0BBR+lL2eQ9qaxi5nx6Yfv1Xu8vjWCjgTCq3grNbaxkzybEfTpq2T5CJ25+07eDA0U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-30.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOACtXKgbo9wMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM36igm4DOMivZpWFyIX9cJ758aVMIt5Gt1600sDxiy+jqdJqVxAn6q7l0hs7yeOuv5KudBqo9RPKqmm8m33tnsCAwEAAaN/MH0wHQYDVR0OBBYEFKGhyw2EmFJeU01IHvvDGun3/2H0ME4GA1UdIwRHMEWAFKGhyw2EmFJeU01IHvvDGun3/2H0oSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA4AK1cqBuj3AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGCKsGmCULIdk1GzIERKT0BBR+lL2eQ9qaxi5nx6Yfv1Xu8vjWCjgTCq3grNbaxkzybEfTpq2T5CJ25+07eDA0U=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index dfa6db5c..00000000
--- a/swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-30.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPqknqiLEb9gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANmHixMB2B/scudMaRwlDbOHU8HQT4J0I48/3rov70wO4DSSgHOBb0cWwR9CCXk1tTvSqYy0euy4VFpNtd2c6lECAwEAAaN/MH0wHQYDVR0OBBYEFBVmKvYmyD3REC57BXD07/1pj3TCME4GA1UdIwRHMEWAFBVmKvYmyD3REC57BXD07/1pj3TCoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA+qSeqIsRv2AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFsqSEwiKN92B4t8xE1Ac2mpIhNce8GxRjYB92QUzuVJUCo0YgbThHunAYnCgwYU42lfmavtziXEuHhs+IRY3hg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-30.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAPqknqiLEb9gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANmHixMB2B/scudMaRwlDbOHU8HQT4J0I48/3rov70wO4DSSgHOBb0cWwR9CCXk1tTvSqYy0euy4VFpNtd2c6lECAwEAAaN/MH0wHQYDVR0OBBYEFBVmKvYmyD3REC57BXD07/1pj3TCME4GA1UdIwRHMEWAFBVmKvYmyD3REC57BXD07/1pj3TCoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkA+qSeqIsRv2AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFsqSEwiKN92B4t8xE1Ac2mpIhNce8GxRjYB92QUzuVJUCo0YgbThHunAYnCgwYU42lfmavtziXEuHhs+IRY3hg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8452/idp/profile/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/nya-30.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-30.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 989c2995..00000000
--- a/swamid-2.0/nya-30.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-30.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-30.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL7Kj3icfbiQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU5WhcNMjEwMjI3
-MTYyODU5WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3j1wO/GY9r6TfmAFyityGo8mYN/AnAQT
-ESgVszEKhqKSaB+h2SWN2FyrpEE1RtAwJkUOJW2XF4G8ADV1hi7ojzZcooW3WIxR
-+BE4BbzwyrOuMCWIcuSF8Tq0iped0pIRad36kW9ZtvGTzQwWQKTi90CxZ/7xhi9k
-NL3FDzdsMv1xK3oxrAuuATr/SDXf4RzlLDwEwR93r3MjwUs+nKeHJhtwKIwQEgRb
-Q/QdfWIh3Q9vSprGydLf/m8+Nf6ka2GREBtpqR0XNUILpx3M4SLnqJiY3VqejhtL
-wpaJz9BrJpD0qmzCi1mwf+19qqQbEmV9bTw+i9rxxQdW7QDjUou11QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQehqcy07TF2u1AZ266Rst/
-tDx/8jANBgkqhkiG9w0BAQUFAAOCAQEAI23vkHQC0Y/1QhiCjMKokj4lEWSL2p2p
-kU8wLpZhJQ/Y5QhXXJ/6LkxxME+yBhixr+45jYwNCbEWwjSbDRcTqAVgBn3SsKRb
-4jbxtCnfMl9n8Eya1QghH7v4xejkZRefU6mechmXhpaJZTpBpxGjCLZ0iQE0Vbwz
-iLwLCapfvHt1aTPoEmzADBxqfSH0E3pykxVvI6Bwcfg42+3Rgvo3xzH25L1WY+6R
-zzp+QuW8WcDmm2eBLLnDgFHG7Zh22MSr8hAo3Q8o3/C0D9iQg7VV36WZSkUM4keo
-eemU9AtLDw8r0Sd3K76LttVjQzUXSVN9jLvx7ahW2+mqbx3OWJFYfQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-30.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL7Kj3icfbiQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU5WhcNMjEwMjI3
-MTYyODU5WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3j1wO/GY9r6TfmAFyityGo8mYN/AnAQT
-ESgVszEKhqKSaB+h2SWN2FyrpEE1RtAwJkUOJW2XF4G8ADV1hi7ojzZcooW3WIxR
-+BE4BbzwyrOuMCWIcuSF8Tq0iped0pIRad36kW9ZtvGTzQwWQKTi90CxZ/7xhi9k
-NL3FDzdsMv1xK3oxrAuuATr/SDXf4RzlLDwEwR93r3MjwUs+nKeHJhtwKIwQEgRb
-Q/QdfWIh3Q9vSprGydLf/m8+Nf6ka2GREBtpqR0XNUILpx3M4SLnqJiY3VqejhtL
-wpaJz9BrJpD0qmzCi1mwf+19qqQbEmV9bTw+i9rxxQdW7QDjUou11QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQehqcy07TF2u1AZ266Rst/
-tDx/8jANBgkqhkiG9w0BAQUFAAOCAQEAI23vkHQC0Y/1QhiCjMKokj4lEWSL2p2p
-kU8wLpZhJQ/Y5QhXXJ/6LkxxME+yBhixr+45jYwNCbEWwjSbDRcTqAVgBn3SsKRb
-4jbxtCnfMl9n8Eya1QghH7v4xejkZRefU6mechmXhpaJZTpBpxGjCLZ0iQE0Vbwz
-iLwLCapfvHt1aTPoEmzADBxqfSH0E3pykxVvI6Bwcfg42+3Rgvo3xzH25L1WY+6R
-zzp+QuW8WcDmm2eBLLnDgFHG7Zh22MSr8hAo3Q8o3/C0D9iQg7VV36WZSkUM4keo
-eemU9AtLDw8r0Sd3K76LttVjQzUXSVN9jLvx7ahW2+mqbx3OWJFYfQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-30.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-30.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index a40735f4..00000000
--- a/swamid-2.0/nya-30.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-30.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIi5L+Ds61H7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJw37GcLrr0tqkrwK82PucThhXbMGny3b03QKRMC2NPxk9SFHo0cLFzG8WB9RaUbpy58yF7fLXn0XjD94IwogqsCAwEAAaN/MH0wHQYDVR0OBBYEFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtME4GA1UdIwRHMEWAFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkAiLkv4OzrUfswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABws5V3NQYoBnm6z6heIDrFWp59aLglcWMZPjzbKL7gNX8IetVL34mc+ESHm1ct//UXT0Ef0xGnPCgXSb3x6ixc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-30.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIi5L+Ds61H7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyOTAwWhcNMjEwMjI3MTYyOTAwWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJw37GcLrr0tqkrwK82PucThhXbMGny3b03QKRMC2NPxk9SFHo0cLFzG8WB9RaUbpy58yF7fLXn0XjD94IwogqsCAwEAAaN/MH0wHQYDVR0OBBYEFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtME4GA1UdIwRHMEWAFLO6Qcb4ZuJ9v53BTzIGL9WpsOBtoSKkIDAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlggkAiLkv4OzrUfswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABws5V3NQYoBnm6z6heIDrFWp59aLglcWMZPjzbKL7gNX8IetVL34mc+ESHm1ct//UXT0Ef0xGnPCgXSb3x6ixc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-31.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-31.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 66c9148d..00000000
--- a/swamid-2.0/nya-31.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-31.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-31.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-31.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-31.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOT44fHr8QzJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTM1WhcNMjExMjEz
-MTQxNTM1WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzRyaME9gw8p1ZfmCFurW6H+zwU+AdIvF
-kVxLMhbgVbHgvhMY+RUIy0BPaQko9jbhqcqE4UVaKkaf30zB01LgBrj9x99caUDK
-wRtdEC3ryVFTR+umu+26PFdXM3S+sWjl13GmxydIlrGmUGdZcP8mAmEyCa71IdvX
-puaX6aSQkI9G22hRPEUpwUCV8hQo3m/yaH2fpf66kHbFikWoqprWTTcDx50tqN0T
-8EwpXzRt+xkWeCdgGL1pNgGKsOHBSwSE28r2kDKdhpzgy31UN9fkcRAlfRmw730X
-i2LIgxl2KNvJhE3MwsSP24Q0a6YAguTWe2DYLbQLVt2V/1CYucTeXQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzEubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQhYCoMNe8slK0YsHjt
-1FMDlP1GTDANBgkqhkiG9w0BAQUFAAOCAQEAQfIBJUOFHO1bsbvqLnjmN0JbeAqq
-fajalWObaE7tSo0wTJ6Kx5EOcI88Tj3st+bpHaMK2CbkeyKC9u/19tC3nvKnw3pf
-FZfdAVnfMf0QAP8X+aZVVgGBvNml+Ri3osgbpGP/uY4FMkKu+q3BnoWFlF4BYNYx
-CQH7v74f7xCdM1QSuN+4EOkDvIevfQ4+cZNj5Vr6QUJH0Xzv8rhnAe90ckm9hpld
-pyypYd04t3ZKJzjs3yF6CFmIhEFzDHNI9M3g9ropA5yRXVacFOcPRDkjuRyiMDqC
-bFjcNEEWynDyWSL+AUkSJqRpqU/2PU1bo2zj/jAY23UhpytGyKzLJ37EcA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 061afb18..00000000
--- a/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-31.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-31.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-31.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-31.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKxhn4OjV3mfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQzWhcNMjEwODIw
-MTM0NjQzWjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp20De30hR37Ei63X7J7M33q6VV5RY9BH
-dQdtqVYW9pMelKv2s38ZcwteQ3KH0WQt50f7pq9sXMHcYqTtkPz6PxRedYesIaf+
-rW9bibHsMzjNw+2RUkVYyN5HH0daIDUnYyX01Rj5ANaMjEoCzlmjlEQXnEq9+QiM
-CQAB8T7xzi0qAX2ixij8nGff4Uctcc+reqW6vFt+lwFSYEvn/lM7VGIJtZ8imrUR
-cLfiLQgKfvWzWVOnl4m1MBFUaxSGKuqQ1/4tUdO3VOjjXuszntLe5eIg9OFGgJxD
-qvLagdeAR1guMMHLjcj1Dt2/6KtRvzfYU8dKZciaF00pnyikAnLO/wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzEubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRQUqPhsgCncjQkbhGvRaXo
-aHxSZDANBgkqhkiG9w0BAQUFAAOCAQEAeQS76KCkJi6Y3rOh31plrVND1pV57nyP
-nxaQYuHNd+J7s+TP9FMaP+iat6/gnnlTe/rLKJ54PCKcQI3YcjLd4TX45JL1iulm
-oAeY4H4sEBe06xtg8LZxyxgRd0GfsUO2X4qzexJZ7JUNmk916f2/mAW/ff/OO7c6
-BiuvGaKqNQWM8fCbAcPaO9kTwtOH6GRmaKRkUSgHzQ5WvirMr185XKWHVOSnHEzr
-yzEpJMRHKMR4oeByBm3dzcDS1he+MjX1/dwlxk5r9v4Qoex5EgXqu6V6bCOBoEJ9
-eSuhc4ni/xBH6cv/RIyt81eqFoj216n2KBlREVNbCYGYSIxwSuEpcA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-31.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-31.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 0ac3af55..00000000
--- a/swamid-2.0/nya-31.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-31.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL+FAivz13wLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ2WhcNMjEwODIwMTM0NjQ2WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALp5DV6Fu4Cat4s7g1LUE+PmQUsi83SlqhBMYHPVeYpUpCq7STPKqVHuNV083mOPHBJ73E1PVjjRf/0Jyg1yx6ECAwEAAaN/MH0wHQYDVR0OBBYEFG26WgTyYuTGeoxhLr/hx/H3xHkPME4GA1UdIwRHMEWAFG26WgTyYuTGeoxhLr/hx/H3xHkPoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAv4UCK/PXfAswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT+SzALKcgJx65cbn2d3XkJtJwzGzo4jIXPxvfFF5Zep5fsIijoKdrYpvJQsOFN0IWzspxPPZDSYZy/pemm6jc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-31.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL+FAivz13wLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ2WhcNMjEwODIwMTM0NjQ2WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALp5DV6Fu4Cat4s7g1LUE+PmQUsi83SlqhBMYHPVeYpUpCq7STPKqVHuNV083mOPHBJ73E1PVjjRf/0Jyg1yx6ECAwEAAaN/MH0wHQYDVR0OBBYEFG26WgTyYuTGeoxhLr/hx/H3xHkPME4GA1UdIwRHMEWAFG26WgTyYuTGeoxhLr/hx/H3xHkPoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAv4UCK/PXfAswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACT+SzALKcgJx65cbn2d3XkJtJwzGzo4jIXPxvfFF5Zep5fsIijoKdrYpvJQsOFN0IWzspxPPZDSYZy/pemm6jc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 5dac7d1e..00000000
--- a/swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-31.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAO8spGwUXjfVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMc0z2Nwa4XJFkH0LtoFqvwWAb3xjLD27KvWCtnWeuqD6y+Bs3m3IOVgKC7fnmnYSK2m96X8SEXohxekHuf/vwsCAwEAAaN/MH0wHQYDVR0OBBYEFGdrsuNRUmmjeqYiFlawR4s5UGe8ME4GA1UdIwRHMEWAFGdrsuNRUmmjeqYiFlawR4s5UGe8oSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkA7yykbBReN9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMFDnTFRRf6r2hNR8ZJcsKWk4Yx04zixXCLG0UIdEsjfOmgeaTsGSNtL0SHuZWOTqsvI35IZzohVud2xjBI1u+Y=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-31.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAO8spGwUXjfVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMc0z2Nwa4XJFkH0LtoFqvwWAb3xjLD27KvWCtnWeuqD6y+Bs3m3IOVgKC7fnmnYSK2m96X8SEXohxekHuf/vwsCAwEAAaN/MH0wHQYDVR0OBBYEFGdrsuNRUmmjeqYiFlawR4s5UGe8ME4GA1UdIwRHMEWAFGdrsuNRUmmjeqYiFlawR4s5UGe8oSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkA7yykbBReN9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMFDnTFRRf6r2hNR8ZJcsKWk4Yx04zixXCLG0UIdEsjfOmgeaTsGSNtL0SHuZWOTqsvI35IZzohVud2xjBI1u+Y=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8452/idp/profile/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/nya-31.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-31.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 5c9bcc90..00000000
--- a/swamid-2.0/nya-31.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-31.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-31.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-31.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-31.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANTOg5fLRgejMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ1WhcNMjEwODIw
-MTM0NjQ1WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbJpBq/2R1Gz3XLyfDw0IQmuJmre8kBt
-F2gcCVqZcWQRsJAQB7xa5Kt9YEURw0IPijdVd/5ON6EFqEt4YTYozoYbLgoBxV1I
-08lVb4hnSZ7VEHlW8XEZG4upG4MlgtRmBQSHN1TKvIFYspF30PDIrDZgH3mZUmj8
-erfltPmJIm7IAAsKbZQu4qxve1a57tYasinWA+Q4f65Of46ehu3Cd4mHMzzCyFuU
-zESpjCoz7Rpc+KfHQ8vBhjfW2c1A4icDa9542FZgojqUfx91m4XqGnLLl8cp/lJI
-M7UvUEcQO+MHnwEX6SB4b4O2QeO7nV4xx8cBN+gCzOO3uCj3WFRRSwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzEubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRouEMQvsAuhGGVc405Wyxp
-ylTpiTANBgkqhkiG9w0BAQUFAAOCAQEAE42li12AMxPHT0683Z+t4opgDoqeCwln
-A95cEJ/C/SeOjPm4rU4YAsGLfL5OKvHywl5ARmxi6FX+bJ85rY5LHS8o3r2dIkIR
-+v26AkxhGNC2ykEH6aagNynyWCwnXtSfaRWe4EGPmlJe8immC2jjubQpm7hhdhe9
-/tiImrWOCGUHDvTA355qI37LPrxCGteaDSupN6iAKI5kPxMMYO8p2VQEEKaCl1TN
-aa+JVhSWHrKvYC+St9hdzmMgo/d1Xd1ra5tkg9FIP1PbDuP4aYL9q0wcAtgiABMs
-9MNdQpKFYtlYTjfVhzTPU3nOE/VSt2Hc/JA00+cqTeG836FhwSejGA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-31.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-31.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-31.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 5904cfb0..00000000
--- a/swamid-2.0/nya-31.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-31.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI/iS162LDzJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ3WhcNMjEwODIwMTM0NjQ3WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8g47yAwh8jny7DrxYLKs9ypQo3ImFoQJldx/+Bv7jimRLYIQWqs2EluY9j05O1C0pKOdQ3u+qd1C5O6tenqu0CAwEAAaN/MH0wHQYDVR0OBBYEFBw+B42Z8NlNFhxmqVcfswgxueUsME4GA1UdIwRHMEWAFBw+B42Z8NlNFhxmqVcfswgxueUsoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAj+JLXrYsPMkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGNZkzRBEOudvbQsmbQksLknS+7Be7awb5owkt+qaxGN2anFB8zmK3mjehmZp0D4/eKt6abceEJIzG+x3yD6t5o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-31.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI/iS162LDzJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQ3WhcNMjEwODIwMTM0NjQ3WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM8g47yAwh8jny7DrxYLKs9ypQo3ImFoQJldx/+Bv7jimRLYIQWqs2EluY9j05O1C0pKOdQ3u+qd1C5O6tenqu0CAwEAAaN/MH0wHQYDVR0OBBYEFBw+B42Z8NlNFhxmqVcfswgxueUsME4GA1UdIwRHMEWAFBw+B42Z8NlNFhxmqVcfswgxueUsoSKkIDAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlggkAj+JLXrYsPMkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGNZkzRBEOudvbQsmbQksLknS+7Be7awb5owkt+qaxGN2anFB8zmK3mjehmZp0D4/eKt6abceEJIzG+x3yD6t5o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-32.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-32.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index f2e45f5d..00000000
--- a/swamid-2.0/nya-32.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-32.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-32.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-32.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-32.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMYFTiBLfsi7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTM5WhcNMjExMjEz
-MTQxNTM5WjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqI1QqtbNrfmkKJOQx/pjEH/sQI6dgPEC
-cgv9PCxSpLcOt2aJsGrlJtb0POLMvqUK5zElWsFiYN1eDUHsQb39dsTEXj3SKiOP
-WNwez4WkSIOXSFRqU2LdezfSPJAssErOZHkos6Ug9IGhCvS66xVSU+sX4t2zvWIO
-a1NivRNoFdOD3Y+Qoh0lpccT5jH1PycU2cG6enfNl7ldQLOhNczgmYjoWg+3BG4C
-sCJT8T7ngGK799i3fQJbvzBnVO2MdZ3SZzFLBAaX9Y+rwaje3HnFj4KVdXrtnCQY
-uBt5YE4L/hep1urzUALijMPCsHG+Hu2OqQYnbcuZu5bsiHtioEafZwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzIubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQp2p1Hs71RPOvkrqO8
-tyAut+V8RDANBgkqhkiG9w0BAQUFAAOCAQEAi56rnjNM7fOey7YGbz3/kCVp1+Y0
-kjoWJn0k3dmrKbsSlZnG2OKkNQ81U4dRFSahWZcRiaVukO/yyWOloej23aYEIHNR
-vYpNt/NREqng2W4tE75Vfmzi44/beZoZdLbKawMXF14fvhdDDF3bRtuqVNZPk9j6
-gG0eguKksNMYTp6cQD/uD3EaHt3c3LV81oIlUp5D2nKUq/MvO9m2VSdNzrr85BRT
-ze6cZZC2EhE0JmqLOY7di4cTUHQlnWKUzt8CANCNJBUu+bi8rg8S691FNSNWE3x4
-ouqh4/BW89AV39CyWouTKL/oUDl8p4h3TjZ/doN4OaXUHRtAFKCp5gpkRg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-32.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-32.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index ab4aaa16..00000000
--- a/swamid-2.0/nya-32.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-32.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-32.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-32.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-32.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALd8g8NioXVQMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzM5WhcNMjEwODIx
-MDcxNzM5WjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqR4coddQp0yOG5b2Gvo/ZxplfQY2SYuK
-Nj9+JFrhGatmyHkCZtqA15RSLrX2DGXiTfqkMDr+3bn+1E2oG3P/g3ZnrvFtn/d+
-wE6xL+ouse7rTrjdMXsY7AZY/IfovPj3JedENTBYfWS9UAjWmpMkBr3C7qcxWoS1
-kgHFfh56ZpX32Xd2iOGg/McZL/JIJfjwtdxqgiBigqn0608bBhYxd8QBlMS6Euz7
-RDrjHGpLtfuP3cu4bnF7DfQa+umYfHbIYWkwwAkTk60VrTPaReuHb87rUHa6YfNx
-TDOKrsLRd81ytjU1VOZ7ZLyG8sWJTeEvUYdzwNDKuYSbTKoGRPwyJwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzIubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSSF0AhtXffyTHA/56AxhOx
-iGs/ZjANBgkqhkiG9w0BAQUFAAOCAQEAKqJUP7jitW6qAbtA6gxgmutA1GTPNSDl
-QtHoMBzgWOlT99avr/k6xwnFxKNm0lks4ClfUPVMnwVlm5z+KdC81U++wxluxher
-MGXL1l9Rwjv6AsUglG2ZsIyvsCzcW0qI0e0Pj7QtDct1qeB70mb+J8/uezbiNBeT
-f7AjER4HOvSAl7rIt450L3I2GE0HtILAHy4+/J0wAjGBx810Ohl9l/6I/iHWC4py
-ShYFSITMVd8HZ6fPI1NbrSwKbtL1KZO0xvmSYmTK7h3VDm9m5moxQ4p4R92mL+ca
-ybnD0i9t+UFDS/QhEKO6/is+8xtYfWVl2nUZy1pjnd4GL7Ayo2D8Ig==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-32.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-32.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-32.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index ae2c459c..00000000
--- a/swamid-2.0/nya-32.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-32.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOg+2kBEwyGOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQwWhcNMjEwODIxMDcxNzQwWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO3JpytWooU9BzKpjAYTmc9Vb5w2w0VzuFFIWSQ6MHUuD/vSZm3uySKb1AEyJL3o8hxv1lgbs40rWzVfBlwZviUCAwEAAaN/MH0wHQYDVR0OBBYEFFVUxSdTq3dVlKHDmwOWDaPBGEpSME4GA1UdIwRHMEWAFFVUxSdTq3dVlKHDmwOWDaPBGEpSoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6D7aQETDIY4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMmOPe1KtG6OV/IxXE0issDWJZqYAY0FUvo6xXsvCGnFM3cDOeR9uqXMsUaNkhM6dCAlBSDYvZaEDbX1Rr8gUAo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-32.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOg+2kBEwyGOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQwWhcNMjEwODIxMDcxNzQwWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO3JpytWooU9BzKpjAYTmc9Vb5w2w0VzuFFIWSQ6MHUuD/vSZm3uySKb1AEyJL3o8hxv1lgbs40rWzVfBlwZviUCAwEAAaN/MH0wHQYDVR0OBBYEFFVUxSdTq3dVlKHDmwOWDaPBGEpSME4GA1UdIwRHMEWAFFVUxSdTq3dVlKHDmwOWDaPBGEpSoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6D7aQETDIY4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMmOPe1KtG6OV/IxXE0issDWJZqYAY0FUvo6xXsvCGnFM3cDOeR9uqXMsUaNkhM6dCAlBSDYvZaEDbX1Rr8gUAo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index eb9a0dda..00000000
--- a/swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-32.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIKeOL8XOgAOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALJDpQuqMvs/3aNXW4l2V5KYiRkowLSxd2heHHMdmGzUNg3BU1gSv3Qnid3NE8OCcOnPJdYZVix/RdTDdUEgysECAwEAAaN/MH0wHQYDVR0OBBYEFLauid4m01JzblyhCZwlvSC88gJ7ME4GA1UdIwRHMEWAFLauid4m01JzblyhCZwlvSC88gJ7oSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkAgp44vxc6AA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAnZlXyv+fp1AgIvpTNlDfYty4mWZBuR3Z4j5WB4eoSHUmir+YQjhh4IkzdemE1tUaEy/7/6wA7JNxx5/eetOiE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-32.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAIKeOL8XOgAOMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALJDpQuqMvs/3aNXW4l2V5KYiRkowLSxd2heHHMdmGzUNg3BU1gSv3Qnid3NE8OCcOnPJdYZVix/RdTDdUEgysECAwEAAaN/MH0wHQYDVR0OBBYEFLauid4m01JzblyhCZwlvSC88gJ7ME4GA1UdIwRHMEWAFLauid4m01JzblyhCZwlvSC88gJ7oSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkAgp44vxc6AA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAnZlXyv+fp1AgIvpTNlDfYty4mWZBuR3Z4j5WB4eoSHUmir+YQjhh4IkzdemE1tUaEy/7/6wA7JNxx5/eetOiE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8452/idp/profile/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/nya-32.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-32.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 298a064e..00000000
--- a/swamid-2.0/nya-32.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-32.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-32.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-32.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-32.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANvan0U/2AADMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQwWhcNMjEwODIx
-MDcxNzQwWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyuR6r480fskHHRioeBsWdWU6Db3Qf2vc
-s4tNPyLEJXbAf1HzVEaGVEyc7i8nKBhy+Bc0AKKVLX55CeHj2z92Z/FR0IsX4gHs
-0jN3CTkybDLoe7yffJenuSaCGN16r2p+sJakIsO20M7VPZ5vIxPDP85q34TIhVpk
-Tna8qaxa2ww+vO86aDGacOr6UnPaMUeOJxtdjlC5lVtqEA0l0T+PDfxOFZS7CGiu
-yBdqGECMD4ygm94eS4MLk9tIFQO4NIghxGMtmMBorPs78tGTulAd4r9ddplOT9qW
-6kGCZYSaXzs47KpnNz/TNyvYgqvLOZliPeJqIkm+2T9MiSVcHcbABQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzIubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR5sZ+zBkbQjUYclTRyqfWl
-sOWvaTANBgkqhkiG9w0BAQUFAAOCAQEApjKZ9XzHzxTm7yvq3Mi2p+BePsvEQ6BE
-DxjvYIjR/bFIUJRlJWeTb72q9cY/VIH+lEXSCkhJASZa7cOHJmSvB/zk0LH8/JsP
-L9btLFKhQdHR/bv+aV657SO4FSqs1DXRoisYorKXqbvy4WJ44VaihAxxcIzAUSY5
-Kdhs4RilceLkMa0jcbck/8PPEI0Tp03s0kFH6sR+1rwesV24NRfDq2EmzxUwrmar
-cwcG7Cq51ZjaSkumYQxQCD16M6DQgie/hy1pc2VwSqENOuo4BHIwMUarYi8qfdOI
-VFqcetQMHP7Bf7EOgoJmijpn9mvX5vjvEqJOxjsuMjzTWc5r6uQufg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-32.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-32.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-32.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index c3765bd5..00000000
--- a/swamid-2.0/nya-32.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-32.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOsHKLbyS6geMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQyWhcNMjEwODIxMDcxNzQyWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u9Pce0+6GBIDbIukK1AK0YVWlQCVxrvHjX8weln6Zyki3srkXnknILM1AUJpemSW8HW8odll5u1/iuDaAtSUCAwEAAaN/MH0wHQYDVR0OBBYEFIOcjZ7DzsJi5pTPJPeNErmBwa0KME4GA1UdIwRHMEWAFIOcjZ7DzsJi5pTPJPeNErmBwa0KoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6wcotvJLqB4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHjJ6ap7ESc8tkH/lOVDIyjAGLQdrxJRY6Z0MZijoWl4p5NX1Tv8FfuzGMx2Fa1PmmN5n+xpFwsxSIVDDZf1lyI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-32.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOsHKLbyS6geMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQyWhcNMjEwODIxMDcxNzQyWjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9u9Pce0+6GBIDbIukK1AK0YVWlQCVxrvHjX8weln6Zyki3srkXnknILM1AUJpemSW8HW8odll5u1/iuDaAtSUCAwEAAaN/MH0wHQYDVR0OBBYEFIOcjZ7DzsJi5pTPJPeNErmBwa0KME4GA1UdIwRHMEWAFIOcjZ7DzsJi5pTPJPeNErmBwa0KoSKkIDAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlggkA6wcotvJLqB4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHjJ6ap7ESc8tkH/lOVDIyjAGLQdrxJRY6Z0MZijoWl4p5NX1Tv8FfuzGMx2Fa1PmmN5n+xpFwsxSIVDDZf1lyI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-33.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-33.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 86d62981..00000000
--- a/swamid-2.0/nya-33.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-33.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-33.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-33.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-33.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMvj7bSCxnycMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQyWhcNMjExMjEz
-MTQxNTQyWjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAryAnZrzl+BtyvaJOF9Rad9HVTOr9vBBk
-bbB/uqQ+JYs5TQqxr64C7Wc4zNNg49yfwYbOgmUU0OPUnk25D/Bvpf26VA+TlQkv
-cbJTFA905HmFfzvbb82drJgNRrQVm7c1RF+6sGrsOkSPAYL5FYsyLou5vCbuU1+V
-FOpsCyxzKLK0CCOCakpQUR1oDeCOS9TxDXs0wRPr1BDuwmHBGTNl4BDRRRIdQVqI
-ngcJC2sH02gEBQQFwL6TfdieKJtYmAECJ80Wo6J/pSlEe6kbBtayJYTnVzSKNTen
-bVrCVQi/4C7cQGUlbxIt2/SBvRC2s2mQGCLU19ec1BADkFUzHpIhBwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzMubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRezzosA1iZ3KTBRd9j
-HjqwR19pQjANBgkqhkiG9w0BAQUFAAOCAQEAad3yzeNbWdbMVUTX7VcIrjSlLIB7
-sEvgoM4u9v0L6DKmW5grnbdzAEed3b3QCta55dsV9iNNyTUuBtP1phs2UxdvU0q2
-AH0wvJP+7iQgaMWRrqkBkWum8b05/d5mhfAvVS3FhwnefX2WlaA+kaGM6BHe+XZm
-6Fnutbx1YxXaS/YcVPbOwaByenvReO7513gUhW1QeU9eHOnVFPbhnneSKFX1FWa4
-sWpRSY9+5vK1iSol9uKYDjWMPixL3BQJHt6gOfvS820UCL71gCrylXCbEvnLx5G/
-lbJXNPGJ31Iti7u9Y6zus33GbsXQqcHvkP2ouf1QDroQYEyl+fwSjfpuuA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-33.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-33.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 3f6042b4..00000000
--- a/swamid-2.0/nya-33.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-33.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-33.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-33.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-33.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOZ6m5wvm/QUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ0WhcNMjEwODIx
-MDcxNzQ0WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuVn+Cr0JA7TxuO+YC0ANSD/4o7gHIh2D
-4XZebDehzLZ7uOp2QI/qVAfYR0mlPEn6dFj5Mp+cRufpO+Kq2kWRDQ+fzHps8iPN
-p0LzVqs5HDO5Xqr77u8ZiVtHjjQH1b6CUSouS523K9f7YNDt2CK/eC/gldSNx4dm
-Apb/EFP0Gm2Snew4RiUY/6WD8XT0e+IVfyso2En2rBy4eC9MbjcyE+B2nfn5DDDI
-CfD7gGBAJOUdALD0q6t+nS7FZk9B3m3RUXxGbpe8k3nVenseWUfl7snjLOLkhzRW
-I7m8bBL9V3rPLQHAn1d3bpUvgmtWtgEteJfTE/348Gt9xEVJTK1v0QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzMubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQopAXvVcXqM9mXe5H1Ganw
-e24rajANBgkqhkiG9w0BAQUFAAOCAQEAT0tLG87qvxXm/HeEUS5GmX6plGZZRj4j
-YVz3/Q1in4KYYQik4biA6vcKP9hPj/FyI8dd/WoNt/Xtw4JU4X3tYPEdSVi/qS+Q
-HgZS6Hq7ebE9g3KBPVr1vaDT+JmVMPVf3wSwHn9xyyc1jGytJ0EEIRL5ylOigZwE
-1QfMSbLdc/VIHdzhvYnbyzPsf3ZYTGJLkHWfUsuOcI0DeMppVzE7sgoZibLcYDJP
-AS0G/LRgJuwQAJkBQ/kr+wY2BJaoJbF4ziaSnMTopiw64xmIR+T20rawmAlcaDBS
-AxaYhIrukrvgvjdA0uqAk8qILOe7nb1E/rCY/vbbnJQ4NIU2tSm2xA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-33.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-33.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-33.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index d17b6251..00000000
--- a/swamid-2.0/nya-33.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-33.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANrpM++GELEpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ1WhcNMjEwODIxMDcxNzQ1WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL8+IW2j4+oMEcmqfANdpghCxQpLuyptqRvhZ+Ys/v+2RJEI9750USxj4NymIdktQI3eOtUlGRkgZTjJChNYY+0CAwEAAaN/MH0wHQYDVR0OBBYEFMh9P6zaftbxe4ZPSMVMj+U3hGIdME4GA1UdIwRHMEWAFMh9P6zaftbxe4ZPSMVMj+U3hGIdoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkA2ukz74YQsSkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1n1shWQzRG86GQqaWQ8dCvGockEtSnp/UAmOUGWzjT3B3pajRGJIG1XsLA2TNL1r0Wgn28pGJmgLrFTFByBDA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-33.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANrpM++GELEpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ1WhcNMjEwODIxMDcxNzQ1WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL8+IW2j4+oMEcmqfANdpghCxQpLuyptqRvhZ+Ys/v+2RJEI9750USxj4NymIdktQI3eOtUlGRkgZTjJChNYY+0CAwEAAaN/MH0wHQYDVR0OBBYEFMh9P6zaftbxe4ZPSMVMj+U3hGIdME4GA1UdIwRHMEWAFMh9P6zaftbxe4ZPSMVMj+U3hGIdoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkA2ukz74YQsSkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1n1shWQzRG86GQqaWQ8dCvGockEtSnp/UAmOUGWzjT3B3pajRGJIG1XsLA2TNL1r0Wgn28pGJmgLrFTFByBDA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 2eec9c15..00000000
--- a/swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-33.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK39WA3m0E6iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTIwODMwMTQ0NDUwWhcNMjIwODI4MTQ0NDUwWjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUsrSe5Otn+zZC3rXoS28Px27BlcgKsRtYyuf01qCQLlurrTTOaQM0m6KY6+ZSqdNk+9LgCWtOBPTdyuismOT0CAwEAAaN/MH0wHQYDVR0OBBYEFFkVGPqsgS2mUPxFECuCmjIc5o/fME4GA1UdIwRHMEWAFFkVGPqsgS2mUPxFECuCmjIc5o/foSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArf1YDebQTqIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMq3YAKRUf8CdfHxZibwRDIk2pqz+sIEd7FaE1wtAhdoiXQ879SGK+lutrrkZ8bREKwPqNNTkSX1ZUVO0bz/Wos=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-33.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAK39WA3m0E6iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTIwODMwMTQ0NDUwWhcNMjIwODI4MTQ0NDUwWjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUsrSe5Otn+zZC3rXoS28Px27BlcgKsRtYyuf01qCQLlurrTTOaQM0m6KY6+ZSqdNk+9LgCWtOBPTdyuismOT0CAwEAAaN/MH0wHQYDVR0OBBYEFFkVGPqsgS2mUPxFECuCmjIc5o/fME4GA1UdIwRHMEWAFFkVGPqsgS2mUPxFECuCmjIc5o/foSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArf1YDebQTqIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMq3YAKRUf8CdfHxZibwRDIk2pqz+sIEd7FaE1wtAhdoiXQ879SGK+lutrrkZ8bREKwPqNNTkSX1ZUVO0bz/Wos=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8452/idp/profile/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/nya-33.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-33.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index a597519d..00000000
--- a/swamid-2.0/nya-33.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-33.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-33.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-33.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-33.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJGSDl1GqxhaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ1WhcNMjEwODIx
-MDcxNzQ1WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuoM4oUsdlRVkGlj5sVWxf4np+CFQRNKW
-dEwdSLfw1iZ4kzk6/rI6VIxSQISgYwAR2wjGlikprer9gcCP+TVqTawgfxyG/Tgi
-+aHSEIGvHey9sX6ojmoT9AqkYZdNzoutAkt6p1rNwv67tQKSb4SojwWYAVEwjXjH
-mQr3YzWSLSe+PnjNJ1XOOhdqEXBel7Mvltu/dAO/xesF7PoUamfRAD3/phZ85+gn
-k/bW8A3ALqO55FOTAg/8Va/VJ+O1JObdd2xOyGdKlqfuUXKwA/ASIlQW0mtImicw
-y34uGHmXwJWlJ65ya2/MCigXwy0sSurMXwchx9aiAueVrzC5/GdEtwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzMubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRMCkIYHMjQeMewto16Q822
-JOMprTANBgkqhkiG9w0BAQUFAAOCAQEAcd2SgaBNZ7A+usMZASWBaGsN5qRUoxgT
-h2HEbCa7gr/shsNF9lSrDQHOuPXzDKYkDLdHlkoINLRc856zhJqaDGz5BJQI1Vfi
-8iu8BGmeo8QyBTtlm+oSBY9WCYHYuUFnoJs9aqw0HOwUM34TK+B99T9xau1qaCfh
-Gxv1Z6F9RzBaPznX/aXGew1TwvV1Shl/ZmpN5ZGVcGw1Ig6PHFkTzp86r7Rw3J7C
-ldfw5RAgBMtkBr3xyKEJ4JJJMuP3WLg1XN3mpuk7MiTCppvfXNSz/fHENGS5IuwJ
-QGi6KqPz2nNLckpWNPQlqC3OZ5mz+9TOJ/xHXWKOEeOCsOqcL9dhZA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-33.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-33.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-33.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 2ac645f8..00000000
--- a/swamid-2.0/nya-33.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-33.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK8AwCttDkQDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ2WhcNMjEwODIxMDcxNzQ2WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOL66m8qixLOcilEifOBbFfKMBIEVr1T/UPvLmKy3TYMpArS69TlxSPwh4wVRaMIOy2nLOcI4wNelFr0Y94IkTUCAwEAAaN/MH0wHQYDVR0OBBYEFMcsn4OvyYTJ/uFAkmoy0fl2XrJyME4GA1UdIwRHMEWAFMcsn4OvyYTJ/uFAkmoy0fl2XrJyoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArwDAK20ORAMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHa50MUS5lmKpg+R0tGKvjiaTkjjdhCiXMZul1k4YgmMTwzdccEzeLPZTgh+HD/jGhrZuiq8BaoryHvAlszcVYI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-33.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK8AwCttDkQDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ2WhcNMjEwODIxMDcxNzQ2WjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOL66m8qixLOcilEifOBbFfKMBIEVr1T/UPvLmKy3TYMpArS69TlxSPwh4wVRaMIOy2nLOcI4wNelFr0Y94IkTUCAwEAAaN/MH0wHQYDVR0OBBYEFMcsn4OvyYTJ/uFAkmoy0fl2XrJyME4GA1UdIwRHMEWAFMcsn4OvyYTJ/uFAkmoy0fl2XrJyoSKkIDAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlggkArwDAK20ORAMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHa50MUS5lmKpg+R0tGKvjiaTkjjdhCiXMZul1k4YgmMTwzdccEzeLPZTgh+HD/jGhrZuiq8BaoryHvAlszcVYI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 657bcd3d..00000000
--- a/swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-34.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-34.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-34.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-34.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPEqYuWyQ8g1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQ1WhcNMjExMjEz
-MTQxNTQ1WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrNLM/FKIYTwkHrTEOjLqYlhhAJg7iWS
-7WTUFkh2nlhA4iDR4/GQw/yqAQWWotkI5S6dPCl4ZbVXth5j5vp6DubpGV58HRsO
-x1m9r3eKeHmK95TzyazgqbPawfUR1qe3hGVN1ad1J7tPR5T8/jBLWdxTrBZVMJZR
-LOiTSHfdz4KdODkqWqaeHyBxh3mulDpNf+ytllC9uyOV7qD+uBF9WViZnVqMh/B8
-ZOb74vRbvU8KOIVga9shbPUMegXot7IN1mhiuDVvmcYMc5PBTGe56M8toEn89z4n
-C1Llo8qafZA7g2lVPbAHyyNdZKoO/68khXlTm7z2Vs4mGNPV17hxvQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzQubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBR+uscChvQauczeC0kP
-80XBK6OIujANBgkqhkiG9w0BAQUFAAOCAQEAFnMvN0jc+3pzoiKfUS8hj/2AY4F3
-Stsjp6xqzlLCjJLrvtyjmQrLny44xuEzVUA/ptSFUJpBgRUo2ZemTPTEW5ImIAO4
-lTnNuyTfsJ3WS7dB6mw6tRdEKW7ECVkFvMLtK+GrZ4yvF40kM/Lf7PHARqsE9/r2
-uONP8RNcPjPXlxGWaJr4ZGEE6Np6vK7t8SE9KmyAxqDuJsSYSttm/rnxCxyJd2+Q
-gAQFMTUAce/nzKsaiT7Ln4EUErD+pBWI+gZUjJGJY/5X8WeKdckgK/EcIcptunhn
-/46cgE8tJBka35/XLdrnS66LA18NejHHcK3hNCeOoNgTRd0bs0QmuYIBXg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4882534c..00000000
--- a/swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-34.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-34.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-34.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-34.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOmGG2zu/LcUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ4WhcNMjEwODIx
-MDcxNzQ4WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhXItgwlQx4pV1KQt4D+CaXOQMYjKqkJ
-sqxi1AsKVUNMrsohfmI2ywx0wWgzN82QME1VIl5k7lUcJNRnXa8KhHXW8g7P5H/j
-uaWgg/U0ja2P/3lk1V5S31RBgP/x0OZUOrCj1gkXYx3TNTVTNzn2y+izlH122Qrp
-PlUD0gYlXVt8wQyNp35L2RlcBiD8KwlIl005u4r5WP3xwoZCXlC3qWFdOXCW0r38
-c0/GWt9KKWRl/vQczJsvC1YwhlsvkUWpar/bgGw1ahaR9536JI9IeqND11IziDIp
-oAJkX4EG90cpUDbU5hXiCllwMbH1P1g0YWQCesstwnxDc5Xn7D/eZQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzQubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSNeRKWkCDwdCfwVfjNoqQL
-/pu1fjANBgkqhkiG9w0BAQUFAAOCAQEAE6h/WKqFFCJW9CdoNcO5E6s8oGC5tdrg
-qRcHlnRoZ7+cqnbaOPjlkDh/mYEytsitLINplX7QugO2tNbqZ7QxJUt8xE92Cr4V
-vluAC7TDcA+SnuRFwmgkOMbDS4sE0GVr5T+MLGsQ/uOf1cIff6DeNimZT+bQm3QG
-3bOwh4+417OCYCSUW8s+vPVxh30HnJ2de02XMyeY/107Hhdq3fr6hHibBkPgo2Hj
-uNj5mCpWi3flvKo1L0jj1k8OybqqsCz+0gXqkNEhZDOFYbsZaMaTe3TawDVSvDBE
-EKeWQcVdXArhEYNg4mL2ZyOVgbqXqyIBehWErGmPaklzzBZB/163RQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-34.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-34.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 8a36988a..00000000
--- a/swamid-2.0/nya-34.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-34.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ6g3eRFq4aIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ5WhcNMjEwODIxMDcxNzQ5WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAF7of/7QAnBNta02sCWHVHIVmeDVck/3+msAxkzW+iqZuaAg9GfS6TTx/SXlkFhEwp4guGybu8EuAVt+LxM5kCAwEAAaN/MH0wHQYDVR0OBBYEFAdew5XfBB/1xRKUQryE1/u1JejzME4GA1UdIwRHMEWAFAdew5XfBB/1xRKUQryE1/u1JejzoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkAnqDd5EWrhogwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD1yTArACaVKX2ZzTqr9KciHyoMrZVF7yrOww8YEjFKJL2ObjGtjF/2cBRNIOpIOYQtzY+siPL/NjbQ4sbDAqAU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-34.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ6g3eRFq4aIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ5WhcNMjEwODIxMDcxNzQ5WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMAF7of/7QAnBNta02sCWHVHIVmeDVck/3+msAxkzW+iqZuaAg9GfS6TTx/SXlkFhEwp4guGybu8EuAVt+LxM5kCAwEAAaN/MH0wHQYDVR0OBBYEFAdew5XfBB/1xRKUQryE1/u1JejzME4GA1UdIwRHMEWAFAdew5XfBB/1xRKUQryE1/u1JejzoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkAnqDd5EWrhogwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAD1yTArACaVKX2ZzTqr9KciHyoMrZVF7yrOww8YEjFKJL2ObjGtjF/2cBRNIOpIOYQtzY+siPL/NjbQ4sbDAqAU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index d16e3d6f..00000000
--- a/swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-34.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANJz8/ROlR9RMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOmsFeV68C2ofkPerojlGIkGPYQg55G9gF2TwTqMomYjbVo6DBwEJM98BRINV9prj6zaOGrnuH0cgvVZEkjXKxUCAwEAAaN/MH0wHQYDVR0OBBYEFDuCvvBCGBkAJuatKgmIUgdacFhXME4GA1UdIwRHMEWAFDuCvvBCGBkAJuatKgmIUgdacFhXoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA0nPz9E6VH1EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpcgwdjR7qE/9nIfYGCrl6ERPcYAiMJb/FqPFqN5G9NdIjaIleDtjD+w1BGNm80QAfZRIHT7LdLBXxp9q/58pU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-34.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJANJz8/ROlR9RMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOmsFeV68C2ofkPerojlGIkGPYQg55G9gF2TwTqMomYjbVo6DBwEJM98BRINV9prj6zaOGrnuH0cgvVZEkjXKxUCAwEAAaN/MH0wHQYDVR0OBBYEFDuCvvBCGBkAJuatKgmIUgdacFhXME4GA1UdIwRHMEWAFDuCvvBCGBkAJuatKgmIUgdacFhXoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA0nPz9E6VH1EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpcgwdjR7qE/9nIfYGCrl6ERPcYAiMJb/FqPFqN5G9NdIjaIleDtjD+w1BGNm80QAfZRIHT7LdLBXxp9q/58pU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8452/idp/profile/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/nya-34.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-34.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 90482cc5..00000000
--- a/swamid-2.0/nya-34.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-34.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-34.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-34.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-34.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKxx3oVkObbxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ5WhcNMjEwODIx
-MDcxNzQ5WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsP+9jOk89dR96rE/amEqdiEaybf752cn
-qnHsHZ4n6KXPzTrvJwtYbe5M9ywADxvo0gg+Nj7snvGaSsV+I3nhn8VJcxWQ3w+e
-rAjKxubhJ9G/t48yzH2CwMwEiA1p8/hFNdUSMYW4O6cO4UDDZ2VrlHzYdUPeSwEV
-D2QVGpHgmjaoK8w71OEnXZElRTjGjOBqC7htH9zKFjn56sq0t3nx3xv/tAJ5hmnl
-SMX7NQsPAAjX2s8EIlQH3Q8ET/Vinoa0FY+pZ0HXtYK2XfNW5wrZ7qfYErW8qJft
-aqEixU9KOTNGuBrCZKbGmfURuPRiEKf+WLelKpzl1car9BZwQa9uZQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzQubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQNgUSY0gZQT7vfyLqxm4uz
-cuQ0ujANBgkqhkiG9w0BAQUFAAOCAQEANMDvpGBIqILEof2JLjU2YT53zF90cE82
-9hhHxSYpd+56yTuBxriC5yHmclhSaADFSeliBPaCmZdclP68RlfOVdK6DS26e2fv
-0mFMnp3a/VfQgLVx/95vP1OakvGhrJgI6P0HPusPOir5z/rCK0MWC0Fy/pzTYL2q
-N8WC6op8aycyh/gzAKKPIs03dKMCwzL+s2molNe6GCqd9lkRcc8aG7lSH51COuJX
-Ie9boAYkUxRawkTK5Wd2BsdYc/QV4iVCeFohHgF1AQHHj/JMrgLUkr7H9zxvoyvJ
-zL57IjNvnf128YJ93hl1ZBT8gh+s10fCRNwYd4464RWmpJAxcNkIIw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-34.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-34.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-34.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index cef551b0..00000000
--- a/swamid-2.0/nya-34.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-34.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOGqWFAzMYy0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUwWhcNMjEwODIxMDcxNzUwWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKCcdl3q42dB6Ux9AFR+pQKMo9v1dlPhRc/92kdVJjqDQNWp1uhouQ0xeX/l0B+/1sZy4l/AOOqTQ8cuUaSq5zcCAwEAAaN/MH0wHQYDVR0OBBYEFJc0RT4mtF6Nwgp1Mcmzv1StTUKaME4GA1UdIwRHMEWAFJc0RT4mtF6Nwgp1Mcmzv1StTUKaoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA4apYUDMxjLQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIcaitnABSqTkssZBy9lIkRPC+xrUKplUeSXzfiYjrhkmmj0yOcHOlxNYl5b+Jjc+vI7GTiSeWQzHjQdGDFgIXI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-34.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOGqWFAzMYy0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUwWhcNMjEwODIxMDcxNzUwWjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKCcdl3q42dB6Ux9AFR+pQKMo9v1dlPhRc/92kdVJjqDQNWp1uhouQ0xeX/l0B+/1sZy4l/AOOqTQ8cuUaSq5zcCAwEAAaN/MH0wHQYDVR0OBBYEFJc0RT4mtF6Nwgp1Mcmzv1StTUKaME4GA1UdIwRHMEWAFJc0RT4mtF6Nwgp1Mcmzv1StTUKaoSKkIDAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlggkA4apYUDMxjLQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIcaitnABSqTkssZBy9lIkRPC+xrUKplUeSXzfiYjrhkmmj0yOcHOlxNYl5b+Jjc+vI7GTiSeWQzHjQdGDFgIXI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index c1a5fb12..00000000
--- a/swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-35.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-35.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-35.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-35.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKs6KyONyI5kMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQ5WhcNMjExMjEz
-MTQxNTQ5WjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4zTWWdHMvvXnoCjftPRBBqc7ne7aIQuI
-rVbZMCC4Hupc7HXPv9YNcllFIt31x133Pl+pMkbCL8XPxJexsHpfb1L9kLElW4bL
-+kZ6Xp6e3YehgF9D/bN0sL2sGPT5BOTAC5xPYk7fbAqk4VzEdIe8QgTfA6jNciBK
-tlvFVdcIeZA/1EfqymQW7xAIMPDWNgOkI8oFUDxDKyLWXEeNKgekqXRDj+L3qzOy
-ZSL9CQPzKGS5deDGBtjqch0VJx5KPhcPW5LZaEVCm/iSNdZi8+eAPtNhcHTdlCWl
-2dqmF0m1+O9hL6LmqPIK3jvlnzcwncXOIxbw0pgqgx1z8kNRWaQmjQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzUubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSddo1xVsPufJwusEPA
-HdADKq4ACTANBgkqhkiG9w0BAQUFAAOCAQEAoMVSME/FNjBVVz3QQaTGbQM9eYoS
-s9Uxyc1ida0uyeJlqEkKXkKFW/XlER/MLCphR+8aM2h658OJJIOlfJqh4Ptx1oIE
-EzYjDM0/ozpW0xkR2Gbeo5J8Eu2VEKMd+VnoauuxzpGOXMRdQJDAeYLG2mRC85bp
-22qiDmjUdX8OA9AFusHF+9oScu3fVwMozL6EfJwjWdv92rU/+5PohCg6hWE+aPou
-BPoT6aoz5sXDppS3v0/cyPjl7/DXtnSdxFXPrTTmCgqnuxEjQF2MPVcws0VpOs2S
-PC7LK44YcvEIRMBINj1NvlD4wCjEM+JwUTQ8Be8/OhQ+5zrA8qI391pkEQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-35.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-35.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 334b2f25..00000000
--- a/swamid-2.0/nya-35.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-35.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-35.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-35.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-35.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO7qTXd29Vo9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUyWhcNMjEwODIx
-MDcxNzUyWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEpXtVa0BL9QClG5gcu8BT+zsCAbqayd
-THPkt6hQXXuC+ABlt21JudXWTyVMbcINuKVhYOnOBGC4hFhO+6x0c6Zy6ke/4L+z
-bkShIb/yTVipZdacQiH16D77X8k27CYzUEE8i5MZPV7cl3rr5NjGOB/foQkJMfTB
-rnLFFcTmnMnUU89ck2gdwWpdqojaamCpRbHc6mfC1U0HvOazNHlzdYraGc46uzQU
-mfBZXFUXz6prju9hDd14NtFRR+EUffQMyAEMweRpMX/N2EnmmJY8gTFDfyud2oAO
-xFnD3OC2I6/fDHeBYkERqby4i1z9TgMFsZ4H7lXHKjOIjdc3L+3TLwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzUubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSU+1245LE0k184QcLfE2uN
-FNkVcjANBgkqhkiG9w0BAQUFAAOCAQEAS7KsA1//oXxTI33/IKNnDtojQAdw8eyk
-UZZvga2a7LrOIikTNwje1lWW3b3M5BU6IsMYVspw3UOEH0swifaWGrexhgy08IjW
-wEraxxmGvEsJKBHlUlpBpZnmZju3QmvELwGehM6N5WHGnQcsmUIvkRUWUq03XIBt
-KSUhOp+hPthOWV5kLAj3IX8rHKR4Nm8CoAoai4M7hPCiTdxxEforOhg9kbuURCml
-djE+kWGReuRjmlaq5A75YtaPnKPYnCW6vj2GGLyB1km82M+IS35EF9jc1+1KyLnl
-0N/9d4H31tY7M1UfY72g5RcuYQNwHSLXcZPXVQBd+IGVMVgJGrOzTQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-35.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-35.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-35.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index b5562865..00000000
--- a/swamid-2.0/nya-35.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-35.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOPTLQud5MzWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUzWhcNMjEwODIxMDcxNzUzWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPE14hGIrbHvoPMBrK1yLZbZkVUj3la0ZmiTV2+KD3vT4oSb3yOgbygzlB2K1HB/7F2YGTGYKe4xLVt518ddudMCAwEAAaN/MH0wHQYDVR0OBBYEFK4raEZEcCpUf+0RjyesTbVlIdoFME4GA1UdIwRHMEWAFK4raEZEcCpUf+0RjyesTbVlIdoFoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkA49MtC53kzNYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALnPuQS/e0weNyMk9GslZL7IgHULEoEUCf6hzPvp8jW6wcOS3bH87mpqkF7HUi2c6QBHxPGwO/w6ls558Qpsdbw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-35.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOPTLQud5MzWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUzWhcNMjEwODIxMDcxNzUzWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPE14hGIrbHvoPMBrK1yLZbZkVUj3la0ZmiTV2+KD3vT4oSb3yOgbygzlB2K1HB/7F2YGTGYKe4xLVt518ddudMCAwEAAaN/MH0wHQYDVR0OBBYEFK4raEZEcCpUf+0RjyesTbVlIdoFME4GA1UdIwRHMEWAFK4raEZEcCpUf+0RjyesTbVlIdoFoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkA49MtC53kzNYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALnPuQS/e0weNyMk9GslZL7IgHULEoEUCf6hzPvp8jW6wcOS3bH87mpqkF7HUi2c6QBHxPGwO/w6ls558Qpsdbw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 31759408..00000000
--- a/swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-35.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL80njSzSj7mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJSKr3oTpcKmZyFzViQHES/9TYy55ooHPWWw8p89oxHx4EqEBcrvOAF4qp/FTYripv8SmpLrZXFGR52d7vCgkd8CAwEAAaN/MH0wHQYDVR0OBBYEFPr3G1G+cwkBrScyXi2rQ8UEPxjgME4GA1UdIwRHMEWAFPr3G1G+cwkBrScyXi2rQ8UEPxjgoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAvzSeNLNKPuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAItmUdJbExnrE+Ie1LVb7uIK4MZBBjt9hx0HmSpVoQuyNP/cKgoRvk+604ol0Ww6sLSNW46d/rCVcn33P1qOKJw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-35.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAL80njSzSj7mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJSKr3oTpcKmZyFzViQHES/9TYy55ooHPWWw8p89oxHx4EqEBcrvOAF4qp/FTYripv8SmpLrZXFGR52d7vCgkd8CAwEAAaN/MH0wHQYDVR0OBBYEFPr3G1G+cwkBrScyXi2rQ8UEPxjgME4GA1UdIwRHMEWAFPr3G1G+cwkBrScyXi2rQ8UEPxjgoSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAvzSeNLNKPuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAItmUdJbExnrE+Ie1LVb7uIK4MZBBjt9hx0HmSpVoQuyNP/cKgoRvk+604ol0Ww6sLSNW46d/rCVcn33P1qOKJw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8452/idp/profile/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/nya-35.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-35.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 093aff0c..00000000
--- a/swamid-2.0/nya-35.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-35.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-35.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-35.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-35.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALC+gq8X+r1OMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzUzWhcNMjEwODIx
-MDcxNzUzWjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz21UtWq3AD+/aVWDoxz5yINYQqC+Y17D
-ze2cvWdbCUy1sJfKg02Dj9URk8I/iefeq1ddqEioJM26JWLWPAchwAC8TaDR1TfU
-QUSpGAj+LJZp+ZDGbsdw4Ahnn2xcmr0nXaGWz3aFyzbSc7Tmzyr6UfRld4uLCVZ8
-AzMEc++oV9RxSaNIHPMp6AE2pckfwf5/UeYbKYSGokm+exzWgUW3TZHPHbekjsjP
-xHwcPY3QGPXRu24AHRfcaqAt+1KEmqaLgZMyAyuRJh4d17PexV+b/XgIMEYy14Q2
-OsupGFEYp2ExUnvFaqoPFKzJZ6KF4poywKYHXniyfkdnRv0Br9LOcQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzUubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQoa9UweyzBRIe/1SbaOAbM
-sRMe9TANBgkqhkiG9w0BAQUFAAOCAQEAu1ah/IRK5fsCB0I5Pfuzub2Ui7S3rFme
-YgFilmRdqZRLhl0L0V5k1XtzKfpDsW44LY4WX4g1zECkdWNkJ59NYz/KIHseuSf+
-NScCWOUktOKlFsbBmahQo6TLSNXfZ1DnHzZFb2AyikYHiRqZAz9Pcu8DILq4nVK4
-hNBH1LF0xAT1e/oPDKs7plwNBg/yFaZxuQaaNLSevwYslE8xCYbzzk6GjZoBpEG+
-4gcN4Gsl9d0P08Kd8q/rMwOXRcM9e8XXxcu9NkWon+D2bt9CQYe92J4j7aCNsivf
-GxDhYTypY0xjc+tLcOU41Ug++m9wSiBjuwmZetEKZL/uGoRE0358/w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-35.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-35.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-35.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index daa47e4b..00000000
--- a/swamid-2.0/nya-35.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-35.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALALz9MxZInIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzU0WhcNMjEwODIxMDcxNzU0WjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0OhjwgtQQ4g3TZrkOdWum33QSPdlfuCopPVgj4mePebFdi8J5E9eX5bFYsYfXRlCi+KcJTulC4cLUPqPdOHQUCAwEAAaN/MH0wHQYDVR0OBBYEFK6ZPcVgKRnGAXQT/QZcrK+k+zkrME4GA1UdIwRHMEWAFK6ZPcVgKRnGAXQT/QZcrK+k+zkroSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAsAvP0zFkicgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKDRlKJ8r+tmQDTHUehUupjj4PqZ23vipl5VLTlqZrHsLDjbWwdfUY/0JHD3MarVBHuF7dDJne/EMSplJSxuyvE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-35.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALALz9MxZInIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzU0WhcNMjEwODIxMDcxNzU0WjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0OhjwgtQQ4g3TZrkOdWum33QSPdlfuCopPVgj4mePebFdi8J5E9eX5bFYsYfXRlCi+KcJTulC4cLUPqPdOHQUCAwEAAaN/MH0wHQYDVR0OBBYEFK6ZPcVgKRnGAXQT/QZcrK+k+zkrME4GA1UdIwRHMEWAFK6ZPcVgKRnGAXQT/QZcrK+k+zkroSKkIDAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlggkAsAvP0zFkicgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKDRlKJ8r+tmQDTHUehUupjj4PqZ23vipl5VLTlqZrHsLDjbWwdfUY/0JHD3MarVBHuF7dDJne/EMSplJSxuyvE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index aa60398e..00000000
--- a/swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-36.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-36.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-36.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-36.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALhK1Y9fpmtHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwOTU4WhcNMjIwMjE3
-MTIwOTU4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl2sWYZR3jZWNdn+mvD+fAQI9NdpaAQGd
-NnRjHYaYfUW145+h3mrzQg5kxrfC+EvN6+T6cJsNtrHoTquupXtbfGoxQZQ0CIuL
-FfnyNjETW72gpwGoezdXz2DIGI83CC9KmiUpFHDVcqK/DjWMNhhbqSe2sTVLZHq5
-BfIYFn2oZ+CFrhKPbCMHeXrAfRXHUqkezRIDYZQ4Xjh6IrpoXfEUZE5bl79Ya+Re
-zFpflBgKIJz1r08qQM69uTkUtm4YJamqiaED+TB+YMBRD74fbYtlLKedjThzy25j
-/G25B+AQ5JDOQybWGhajgk6L+sPCdkQ++yJKQin8alqU1GgO5q1kbQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzYubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBREAxTVc+1fC+5MvURg
-VAmm5tdP7zANBgkqhkiG9w0BAQUFAAOCAQEAIsLGcRyLpB+H9XtfUyigRA1LoGKv
-nzjxVGyKT0QlML6T/MMETEippnm/iDR4DxxK8JRgNu8L1OpnJTACmL8qWBSUnDRG
-jw9CFfIvfUksy6Y6Yxlee/gQXa7cGXOZMKIBTsKT26ZjB5bc3030j9iIJWgX5q8X
-ruGz8wVhMAG+NuRhdUkZZmgMnVNNiibMmFwP/uzjbgADy5BzB9iaCXLuVL8amRzA
-vXDXzJgkSeaGxlwmRVhzSO53eNo3Pu+NrN/FsrhgcRETjaaFTHCQjDS3yhCWVgkT
-fR7Mgv7dwRyEa5eRgSTdxngJEIQ2/96kThMvqEOn8M85N51fr/8jQaPrRQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-36.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-36.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-36.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index addb596b..00000000
--- a/swamid-2.0/nya-36.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-36.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-36.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-36.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-36.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJhj1Ojd9/n5MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTMwWhcNMjIwMjE3
-MTIwMTMwWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApflPLvKUmK5b/k9Gp3uG02LcUnwvYxFa
-6+5MUPD67KURqRMiXj0DH1TVKzMkpHr/f7vNacwMqoR7xc2fc0turYbU5HMB3Cpl
-fPFzUf8ONJFHuSpEIkIMlBrDGSFPfFSSszSE/r4gALEKx88MNSKpm3Q0XQBV2Zh9
-A7hJSN6NraVn+gEOAMv5nToxEKdzXHobf40aU/FKSPBRIYaNCBZgsm3W+bpzfM/9
-AhDI2D+V13vVLljahHvbQLl2cACyifFK2hz1BwBq3Jp47A8x5+WOfvgdGnPf51sF
-gOU7EPrOk6CSGYxyuaNrv+nhEWg8TmYhZFWPkPdhU2WOWGrSbU/dfQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzYubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQAK+ehi4cqfM0zNhI8b+yi
-lyPx+DANBgkqhkiG9w0BAQUFAAOCAQEALpUw+VfeqTN6a6p+xaBlCyZOCShUorkj
-NvmljN3T0LEtbqAMlG7J/wJXQI9OCwSOt+KU57Sh0Js/uOsKuKdWuv47B7yr9cs+
-N28071y4Z6/z47E7yVW2I3roSNIH0pW8cqu5/j3o9RNmeu4OH3JPm6ePOm6kZix9
-yi1vm+/DdR72Wvuivh0gB55nbnWY0kNZPcv6oQSeIpdd3PFzQZamsQ/0qlY5iwDi
-sLlAnf79ag27JJKfJHPCDtCVixWjvK9USSxgfvxPHP8ueEVKc3pJIGySZZWBgxbn
-wBlhut5PYW3TeSQIoUI4fZdyL+KUHhKsV5vxkWARz7ZLqFWRnDey6Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-36.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-36.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-36.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 74210276..00000000
--- a/swamid-2.0/nya-36.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-36.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOUFSKeyX1XTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM4WhcNMjIwMjE3MTIwMTM4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ0GoQxZ8PeJhgVeuhbQrHHrE4KtfUdKOoUYmIYNWgT86yR/Ey1CRrPjJvwnPuvZx3IWHCYwir7fuybogJC55MCAwEAAaN/MH0wHQYDVR0OBBYEFD7vdCpJmLeUOweTluP/6iKKH0VWME4GA1UdIwRHMEWAFD7vdCpJmLeUOweTluP/6iKKH0VWoSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkA5QVIp7JfVdMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI2yS/NRKFc+8e/XV4sbhCj1xRMBTRp0tc8cSJqNs2/rFgM4Va3ISCgZAPlNmPMG52j1qdDmJuxlzOFwIrNg04w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-36.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOUFSKeyX1XTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM4WhcNMjIwMjE3MTIwMTM4WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANJ0GoQxZ8PeJhgVeuhbQrHHrE4KtfUdKOoUYmIYNWgT86yR/Ey1CRrPjJvwnPuvZx3IWHCYwir7fuybogJC55MCAwEAAaN/MH0wHQYDVR0OBBYEFD7vdCpJmLeUOweTluP/6iKKH0VWME4GA1UdIwRHMEWAFD7vdCpJmLeUOweTluP/6iKKH0VWoSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkA5QVIp7JfVdMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAI2yS/NRKFc+8e/XV4sbhCj1xRMBTRp0tc8cSJqNs2/rFgM4Va3ISCgZAPlNmPMG52j1qdDmJuxlzOFwIrNg04w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index e6fe55e7..00000000
--- a/swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-36.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ8fs8aHtEnwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3gDZWyrZNACXi1Q4sEHhGFDY7tUkGLWF2VJ86Ck2oEpkhscMVEwjZAwde4DA+cddFVHrHshz4pW6ixLCmjr98CAwEAAaN/MH0wHQYDVR0OBBYEFIrWNR2B7Zv8+UMXL5aGFmE2N7v4ME4GA1UdIwRHMEWAFIrWNR2B7Zv8+UMXL5aGFmE2N7v4oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAnx+zxoe0SfAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUidD6y/E8t45SkQPf7xoiXnZ2BdB9JKj5KYd/GLPtjRiQaeckqMCyjCjuAliCtMhOvqXXRwTMLGy1v9mePoGU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-36.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAJ8fs8aHtEnwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3gDZWyrZNACXi1Q4sEHhGFDY7tUkGLWF2VJ86Ck2oEpkhscMVEwjZAwde4DA+cddFVHrHshz4pW6ixLCmjr98CAwEAAaN/MH0wHQYDVR0OBBYEFIrWNR2B7Zv8+UMXL5aGFmE2N7v4ME4GA1UdIwRHMEWAFIrWNR2B7Zv8+UMXL5aGFmE2N7v4oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAnx+zxoe0SfAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIUidD6y/E8t45SkQPf7xoiXnZ2BdB9JKj5KYd/GLPtjRiQaeckqMCyjCjuAliCtMhOvqXXRwTMLGy1v9mePoGU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8452/idp/profile/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/nya-36.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-36.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index a4870290..00000000
--- a/swamid-2.0/nya-36.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-36.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-36.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-36.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-36.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJfszto/sxyMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTM3WhcNMjIwMjE3
-MTIwMTM3WjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAteWDe95JkvjwEfkqQcnTXixyIfxzEYh+
-ubDHutrPd6DMlx3TvU6rppxYFbbhnK6AHwiXZcl7SMu7rdMbtCKcvTg5MoI8z1tm
-Z7NIf3CssarCQ1YpesRAL42TNkrZNUMuiH5zSyQiw07GZFrVWpfu8FvEdI5n03/J
-b9Kr44nFscz/oI4ny2mitv3GsXKbuaEDlPNkCnhiUQ9tRJozi+/zs+hb1Z4VC3XV
-FBa9AAfRv6MHBwINmTLUvI3UVvJOrG7PURIm2vZ3FNFZjxK0VMScgII9AQNGS9PS
-vsWoCjmgmEUN2U4ZkX+jPZM7UCkd+TS7teU8IEypZRBypu7y/B5H5QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzYubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSG5gPXQmtag0vgGRanV2MC
-c0kDaTANBgkqhkiG9w0BAQUFAAOCAQEAg22gdr1KtpAbqIV8rqtuLi2579qL4R7O
-lIlY+RpzUkAlruwPXaRpkt3Z8nI/fY+FeTYe1jgNZYr/cMV2LFdRYs5+7AiDpsuY
-JnHYsimjD1NRdbnMRXUk9izMHfEh9NIObkvuAne9ZFWjsc9+48vEDf738IKDygCf
-gPxvBseMzp+9mqm/jVaso2R1ign73UZ1a/OHJwAD5P1e6oh/AO1EyawB0Ypg0yko
-sh5u9UJkbD9UsSbezCxSM92VAgWaslANeWtqiP+70kMN4NIjv8Yh2/J5JWIYAtGO
-mB2mFhL1WTyIupbJ+KS/jPD49LDSmC/F7wM2Yp5zyURg70eCYcoi3w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-36.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-36.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-36.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index b7e871ea..00000000
--- a/swamid-2.0/nya-36.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-36.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKD7mfgoJBv1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTQxWhcNMjIwMjE3MTIwMTQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmKP8x6NhNQc6ki9Cs01HUVGAWebMoyzmP4LWA/OxMy/n5yxWPCap+uIY45UE/BjKk74I9nS05gGaU4JCB8lj0CAwEAAaN/MH0wHQYDVR0OBBYEFClgB4EwaghSTdppXdERa/D5lE67ME4GA1UdIwRHMEWAFClgB4EwaghSTdppXdERa/D5lE67oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAoPuZ+CgkG/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABDYTXMQD86kjnDusuvT12SH92JdxhyZ1rjKI8q3DZIjkMsq0erCrRldfXcXJbGJ4hVh41TXgswAylKiBnvL6Ww=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-36.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-36.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKD7mfgoJBv1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIwMTQxWhcNMjIwMjE3MTIwMTQxWjAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmKP8x6NhNQc6ki9Cs01HUVGAWebMoyzmP4LWA/OxMy/n5yxWPCap+uIY45UE/BjKk74I9nS05gGaU4JCB8lj0CAwEAAaN/MH0wHQYDVR0OBBYEFClgB4EwaghSTdppXdERa/D5lE67ME4GA1UdIwRHMEWAFClgB4EwaghSTdppXdERa/D5lE67oSKkIDAeMRwwGgYDVQQDExNueWEtMzYubGFkb2sudW11LnNlggkAoPuZ+CgkG/UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABDYTXMQD86kjnDusuvT12SH92JdxhyZ1rjKI8q3DZIjkMsq0erCrRldfXcXJbGJ4hVh41TXgswAylKiBnvL6Ww=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-36.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-37.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-37.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 34ee0ba9..00000000
--- a/swamid-2.0/nya-37.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-37.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-37.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-37.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-37.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJANbKMVBf0N+3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDI5WhcNMjIwMjE3
-MTIxMDI5WjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyzulq3hxPPV48zlizZtGzVIhWyrM7VjF
-ALPzpiCUUJ4f+H8kBgDFfdSL/Z95e7UMPZ97KNSRZDrcNpSCNDB0rPpoEaNP9J4D
-pJSoPy6EgHNHuGfVG3onlJWBq/WkTKQIAvimpQDXuuZXlkhtz5Htv4oesV446RpR
-CIrqL4jjYywA151P4pu9+JqX3VzEsP4U9ZhoDQ5LuelC8NCkHuo8uS7qk8LtZlxX
-QnHuE1cdkTZ6y23PmYEsE/qLDi8CYvLvSFYT1WSe+rSfw0vwnkbsRJvdTbn/uqm6
-xxcATcsjqt37K30KbBgGjQy7/fZKyJ51O56F2cb1B3QdYAnXYZETtQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzcubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTd4L1C/GA8YncgW0WO
-IkwBusLMVTANBgkqhkiG9w0BAQUFAAOCAQEAq8XwQBk0IfFpdtCietDKDdhoCDX0
-5TgcYjZTTZpTcsH0WKfJNM9BvRxRQkCsXwORoyDHW+I2v3IwqEJy9caHwdSatp0r
-xoPHJSI8v6fvq/9tyQPJrTazvhNLvkpc0izarXr+S4zttdbNuH32Twfdq0bahK7+
-0TzOErtzEcNKjNSqv6etu18MNyj9zJ71EyltODEIntHrZUQrCluV2zpthOnp333y
-gC+Zks3ZLCm1vfpCmxuxYDSk/wwNQ7FT2toFK1DB1az7cWnNRhYhcAvTD4kJNFXo
-eat0N8YeSkn/Z2DvjMf2OebesWImhtYpKpF+6q43m989s/xlg8ILDD8GGQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-37.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-37.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-37.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 300f4573..00000000
--- a/swamid-2.0/nya-37.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-37.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-37.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-37.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-37.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAM1bUPj9hBiJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDI3WhcNMjIwMjE3
-MTIxMDI3WjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoq6L1KJ6F9oh2E/XRiXPPcw6jqa1YnVr
-5Sn44fwLwLGTzEER4sgyfNlYX4qq2ZWysgGpMKYSciIJLtb8rQ9QigWdzsvzNCvn
-DP6eTrojXtsj9oNtu71tgkz8A8UUORvgJkV23qycAG7tfXTTPcXHy+NXW/nLZAQV
-nonFec/yCJh/RP43q/OnUohgZTARjYh4Ftm3/C4NU9x8w7OA7cYjlrEynfVjvKus
-GEeOT86r4Xwl1XhcSgeXrU5Hk5ItT2Xb7tNMg2ZDaee/tTAHvoliGMDRvx8zj7Ny
-fi+8DD2uFh18DORfaKPLBik/Geq7M5fKGec3D79UL79Rh8snPjcTtQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzcubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTbD5e3LAGiw3bBPB87b17G
-6AQO0jANBgkqhkiG9w0BAQUFAAOCAQEAknIfDB9aLaKL7pWBQ96V8pkOyyF0leGh
-a7jlAoJzCpW5DI8SKtmc+AhW6Q/kYWDujSgqCpfUR4FKEJfCZ66S2H5EyUI0kL7V
-agmAufAjSZsTaJE5rUdrZD1iQBBBZtnswLGaHh+ldrBjUC2zwjw+C9TSm1di34Ui
-7i9RmEgsG20wLR4lci0EBtZOCWcMd2MTATMaGy7pkr2TY/65ubxzroKpjTW38fO1
-oqgNRA77DupSCZMyS5w6c9SrJT/UXga/syUhD4MRhWynix9OYHH7LesZHCmnzCzm
-ZHSe1xT7XuBxH2JFvECjWNNZArzl00djIgQjxahPpKj61g9+wwIveA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-37.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-37.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-37.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index f840f441..00000000
--- a/swamid-2.0/nya-37.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-37.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANQSOJh8DYXlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMyWhcNMjIwMjE3MTIxMDMyWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0YAPxyYgLCi652c6oxlILzsqfxlc29VFGtk6Xrr0CAkEUoL7n3YfpTXCvhjrbZBvKWMtlL/fIOn/u15QE0SNsCAwEAAaN/MH0wHQYDVR0OBBYEFLJXiHVL7rtdbeyMCG6fFvNPLDRvME4GA1UdIwRHMEWAFLJXiHVL7rtdbeyMCG6fFvNPLDRvoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkA1BI4mHwNheUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKTC9M8yklP0sQBq6FMPFKgVtD5Ba7/r/1gr4eJK/kjA3zte+sRVJU+iLbHhGoJ2t7KE7jCCus4/O5C0lfSD6uk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-37.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANQSOJh8DYXlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMyWhcNMjIwMjE3MTIxMDMyWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL0YAPxyYgLCi652c6oxlILzsqfxlc29VFGtk6Xrr0CAkEUoL7n3YfpTXCvhjrbZBvKWMtlL/fIOn/u15QE0SNsCAwEAAaN/MH0wHQYDVR0OBBYEFLJXiHVL7rtdbeyMCG6fFvNPLDRvME4GA1UdIwRHMEWAFLJXiHVL7rtdbeyMCG6fFvNPLDRvoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkA1BI4mHwNheUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKTC9M8yklP0sQBq6FMPFKgVtD5Ba7/r/1gr4eJK/kjA3zte+sRVJU+iLbHhGoJ2t7KE7jCCus4/O5C0lfSD6uk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 7737c49a..00000000
--- a/swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-37.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI/cAdOMvOANMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL5rGq8Flv0+oUCTJcVUmdE9WgJdcq3bfe7icQWuqKEdfOpTGb2GaEbVocHE/jm3PJNfUhIS+JXJ3AG1J+gflusCAwEAAaN/MH0wHQYDVR0OBBYEFNReZO7G4daB1PXd64+LpZX7zSjeME4GA1UdIwRHMEWAFNReZO7G4daB1PXd64+LpZX7zSjeoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkAj9wB04y84A0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFoQKsgA50KgQHTH2Krb2oc0RFtbPg1it/STHhpKBdp2or/DBtiCqLRH/Uej9blM9rbhPVcFP/7xB4LiL/6WwyE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-37.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAI/cAdOMvOANMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL5rGq8Flv0+oUCTJcVUmdE9WgJdcq3bfe7icQWuqKEdfOpTGb2GaEbVocHE/jm3PJNfUhIS+JXJ3AG1J+gflusCAwEAAaN/MH0wHQYDVR0OBBYEFNReZO7G4daB1PXd64+LpZX7zSjeME4GA1UdIwRHMEWAFNReZO7G4daB1PXd64+LpZX7zSjeoSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkAj9wB04y84A0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAFoQKsgA50KgQHTH2Krb2oc0RFtbPg1it/STHhpKBdp2or/DBtiCqLRH/Uej9blM9rbhPVcFP/7xB4LiL/6WwyE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8452/idp/profile/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/nya-37.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-37.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 27bf0dac..00000000
--- a/swamid-2.0/nya-37.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-37.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-37.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-37.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-37.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOnNuiyORds1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMxWhcNMjIwMjE3
-MTIxMDMxWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAorIWTtZlDOUGWR7Rd20wAFR8Qtn8ZPen
-zEjV0TZwFEemBkP3OUwL0+27xdCFNewKBJwDfHt+S/HRFUENF8/97en38++DWN7E
-ih611nWemMAt4mPQoE8Qm7u6/niFSv/qgj2lOQitwHUnWShwWyTjITwciPI7eNcs
-9e+yP4A1UpgCaPwvFf4pBnfgTk9gTXWtI32T/MswuHgE2PZejuQnYG+akqkNU7hJ
-y80WKR+lSVem46ku+sUKsKm/CfMTYe9wNWkZ1UK4CQOYg5nCanlsR4xiGoo6rxLz
-uYe0HmdSYAnE7M96WtYbnUUbgtsLonC7Pq9cTV8JVFpUZJWPjS2krQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzcubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTdoPl4uOMwyGMrzTXGNta9
-T79VpzANBgkqhkiG9w0BAQUFAAOCAQEAoBXvgsh1tUODxw7c69L+zkgr/fJiXelp
-3yn9LDVc+AUZJwvzatLw2nUdxC5Vq9f4liH33sLc2FwMkQ/IA/oYPAmj4/N1VZHw
-/iIDTXfkCeGM4wB7Z3hE5RQgDviXw/707mdeticQVIMv8RFpennutbvUud+9EJqs
-v+MITneoX0y8YWWqNbvPF6RPba9X36+PXrsZMwidYo4KyxhITAAIz/a4VH1bkzqB
-B8esabwxhY319P25bD1QnMdw8xA6gsl005/UFrmnAyIFC/xTzc9m5J/6GzOIDtXu
-nTtTiknWevaR9hS4GeQtvdaoMIeFPrDgt+hI3VUgbif73APZm3+xBg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-37.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-37.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-37.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 8210e204..00000000
--- a/swamid-2.0/nya-37.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-37.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKcFwf30paUrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMzWhcNMjIwMjE3MTIxMDMzWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ5BqSWVMjhLmhxRoCO3ymBRM1FiKHl7qjY07o4rlxf8XXvOhq4l/71Bt/wamT3zbwexJ1mzQhdGZCEMpovHBDcCAwEAAaN/MH0wHQYDVR0OBBYEFB6dxB00TWNk7M1dNN3Cf9MN214mME4GA1UdIwRHMEWAFB6dxB00TWNk7M1dNN3Cf9MN214moSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkApwXB/fSlpSswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEx473bgDNTZXsU6z4LvWwfbtWYAGPyxuAySZBno76qWLhsP22B85B40cQZLvz0VKhlYWixEZKqDn3fm3eXQUZs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-37.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-37.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKcFwf30paUrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zNy5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMDMzWhcNMjIwMjE3MTIxMDMzWjAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ5BqSWVMjhLmhxRoCO3ymBRM1FiKHl7qjY07o4rlxf8XXvOhq4l/71Bt/wamT3zbwexJ1mzQhdGZCEMpovHBDcCAwEAAaN/MH0wHQYDVR0OBBYEFB6dxB00TWNk7M1dNN3Cf9MN214mME4GA1UdIwRHMEWAFB6dxB00TWNk7M1dNN3Cf9MN214moSKkIDAeMRwwGgYDVQQDExNueWEtMzcubGFkb2sudW11LnNlggkApwXB/fSlpSswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEx473bgDNTZXsU6z4LvWwfbtWYAGPyxuAySZBno76qWLhsP22B85B40cQZLvz0VKhlYWixEZKqDn3fm3eXQUZs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-37.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-38.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-38.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 141d0493..00000000
--- a/swamid-2.0/nya-38.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-38.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-38.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-38.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-38.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAP3TQxoDVevbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM0WhcNMjIwMjE3
-MTIxMjM0WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5K/fMqBI8h0o8uiXOtIZbYIa0X8ITE7t
-MHc61Ywwxe36E5k3acINULheM1bEN84mthOv2XCS2NEhxFBEiO6VT39pqNHkvw/i
-hbQ6ietCuiqw1AuRVJ/+EYPupqkGWSwyNMqOX4sl4/Hw9Wti64u2UIymn+eZKnOq
-K+xw95KlaX0RUasXZjI1swARKVQYD/aoI8oWInnTqVyiVYUDrF6i+IVU5sGZXZF+
-jd/Pbt8dVt2pbs03UETLPIa4wxHe8z5a6I7ltGRP3wEK4IAzDpQAFHcNy8+vdE3c
-Wa7Vlf3SCYJ8ujGaeuirUjMcOFPXylbU+41tI6W1ekdRyU9R+uWsSwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzgubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTXINB6hp450oF4/Lpy
-4eEC/OPBKDANBgkqhkiG9w0BAQUFAAOCAQEA4RPklNI5mgwFrkfedEdTY1TlHxip
-sjPgnv6v7weCbpG0nzjPyS4JXPuiqPoFgVRWNt5QGsddn5TLCg6M1X2pIrnPsCnW
-6cdXBJy+DMmxF17k5dmdI+zLICkQtGeqykmA6pdqO7amVgL4FZNx1C6cLRklxJsN
-oI9RPwUCxYYXKVEEGMPFSVOhGJb6lBRotOv5e22qBDysGQ4x1J69HIFEAP4++MWC
-mCnxI0m0/gWvTi41jCjzzb4VG59qDRq1hwDkjE67LPNHOVyJvgdFdr0WPG9qoSWa
-ouhG3uRk/VpdHB1t83UtN43XlyU/AwoVAoEIaWp45I6yl9z5QuvOdTtYRg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-38.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-38.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-38.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 03af1d80..00000000
--- a/swamid-2.0/nya-38.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-38.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-38.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-38.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-38.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALKCAKyp5BqLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjMxWhcNMjIwMjE3
-MTIxMjMxWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo4iyqpQD7o1Xm740tHRMAX4/INyABRc5
-06Cv+iE+gJiFcTlNXeReXgsrny8a0NXcMM1YV4ChrvKNzsGwGiLcyuuI/gaRMlJg
-wASil2SqJmEYahXWgUF1cRKCfh/jpbMeoH3/4L0jN+M7hw8UN7CyS4AmrwaZfh0O
-cCJg3A9M5euLeItBO0EDAb6RYSHomom74ubu8fZz1sKL5BLItVtWIWQudES/qbsY
-WqA3JGSYtjmK9XoYQiiD2aTl8iTxt12O5begMb8/6SZtFxpwiQWxoX6+h4xCR2Ia
-4vFMjPvK6Wvev5DyVdU88j8u2xHN0ydxDG+lNzL5kUfpZgZuVr24LwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzgubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTUhKUY7DXaN1zXbkt84PPd
-q3SV2zANBgkqhkiG9w0BAQUFAAOCAQEAOQ7kjNXAGnzCENd7rM/jXQY34b3qZyC1
-1AxnFbHJ4MC4WRxyqOBVS0fmg7RXalNWc1f8LeMZsmQKjr8zOaLHFbuCB3dggdBI
-CVp2OIyJWa7P6xZEpss3Dm6Z8YxWnRXNKjhGcLgQk86y2q7TP1HbfCabrmHsfdol
-XwAsREP2ibfin+FayVjODpeqm2w4S6SVNuQDdFkJfnD0u7scmL62o62/nxw8dG4B
-85O6TjNSqGfDp7YzxjOOXrAV9Mj5stuMws8jwTM0FbddiKhWEZlbnmS25FSKDF5f
-lsGuLcchB/CZ1HM8G0wCcUEWMU8qKgs2kQFl457i3RlMt3z4wuTTKw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-38.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-38.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-38.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index c013dfa9..00000000
--- a/swamid-2.0/nya-38.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-38.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALkOSq6QP9CwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM4WhcNMjIwMjE3MTIxMjM4WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmBqh5xqxw8Eh05fh9ILUobYrHZ1zCcXAGEIH+YWTzkvHaOIVMCeCbrnqn/ctQyNUT00i9iyTL3rMzdtcx79IsCAwEAAaN/MH0wHQYDVR0OBBYEFKUhUr2yFolkiwzUTjgAJcyYtKSzME4GA1UdIwRHMEWAFKUhUr2yFolkiwzUTjgAJcyYtKSzoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAuQ5KrpA/0LAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJab8oUqUMnxz0ofX8wWpTt9USDqOL0T4aWK64jdkQTdQ2SGGMphaLvzWB1QL0ZS3nXeljDiqkWBbg4mKwPFZbw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-38.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALkOSq6QP9CwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM4WhcNMjIwMjE3MTIxMjM4WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMmBqh5xqxw8Eh05fh9ILUobYrHZ1zCcXAGEIH+YWTzkvHaOIVMCeCbrnqn/ctQyNUT00i9iyTL3rMzdtcx79IsCAwEAAaN/MH0wHQYDVR0OBBYEFKUhUr2yFolkiwzUTjgAJcyYtKSzME4GA1UdIwRHMEWAFKUhUr2yFolkiwzUTjgAJcyYtKSzoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAuQ5KrpA/0LAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJab8oUqUMnxz0ofX8wWpTt9USDqOL0T4aWK64jdkQTdQ2SGGMphaLvzWB1QL0ZS3nXeljDiqkWBbg4mKwPFZbw=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index ea5ec30a..00000000
--- a/swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-38.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJC1ZZlbTkzKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2Y4TPUpsyS2tFgcrzEJx7y6JvWYU90YYRKEs1G1S4ernJeJbAHKB3M7izNwfuFNZrqPexiHx1+oY58m8GJzvkCAwEAAaN/MH0wHQYDVR0OBBYEFOF4WzH19gx9AUmnRUUOXOxTP2/TME4GA1UdIwRHMEWAFOF4WzH19gx9AUmnRUUOXOxTP2/ToSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAkLVlmVtOTMowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH1tV9F6xuzlNVkATr/OdUoOAhgrDmMkCtMwmm28uVITJtvt4givfH9YCRyrb5rcep909YxOxI9L7bxh7gnNPmQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-38.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAJC1ZZlbTkzKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK2Y4TPUpsyS2tFgcrzEJx7y6JvWYU90YYRKEs1G1S4ernJeJbAHKB3M7izNwfuFNZrqPexiHx1+oY58m8GJzvkCAwEAAaN/MH0wHQYDVR0OBBYEFOF4WzH19gx9AUmnRUUOXOxTP2/TME4GA1UdIwRHMEWAFOF4WzH19gx9AUmnRUUOXOxTP2/ToSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAkLVlmVtOTMowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH1tV9F6xuzlNVkATr/OdUoOAhgrDmMkCtMwmm28uVITJtvt4givfH9YCRyrb5rcep909YxOxI9L7bxh7gnNPmQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8452/idp/profile/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/nya-38.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-38.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 188c787f..00000000
--- a/swamid-2.0/nya-38.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-38.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-38.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-38.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-38.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOwJn0OsSBr4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjM3WhcNMjIwMjE3
-MTIxMjM3WjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqmqPGcsJtUeXmdEqerSLI4/ATiFLnyFR
-aQ8po9mh+xENYrTd+gwdmNGqYnJx/34J5+/ApXVSaXpnecoY7aO4iFbTkDZ8/UbL
-BDJTNn6D9bW5a/oOUEun+deJA40imJo67uSJDI5ORBKvyFtedu1c+e/rY9Z0ekdA
-J5ia7emFWOBTtTdaFu0wb2vxyoedtzTWgc1/bBozzPOxGMNh3AfzYYauDlGv0Dkf
-rmQNjC9tx5pHUDj33VD+B2duitW3F/E9x6MnKDnTNAlwKR45ZAKSRRe32kYOo0NW
-P7+juJrrZ1580l1e96NAgmYbz7Zb5F7YmKVBmby7YhIblWonjxsCIQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzgubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSMnvzBB0b5ttuCt50GpWJv
-PRLl9TANBgkqhkiG9w0BAQUFAAOCAQEACWO0qya465ugXHaimrB7wdv+gZ2nfIqd
-SlinbV9rI5SILG5JpsZKOOGd5VCAtgXR2o9XcuGZH9cCu8cioPPnzsvpA1/BaECD
-hxpRw7V1bTYlQYgk2R+YfSHcUa+QRX4JQz1weS9VmVeFxAYyokOVFk94ifbaiOkx
-Ooo9a8A6PIuxen5M3OuJmWItu6QwRCAgmn53oUx0andaWe6o4IR4czD6txjauaV+
-B2OclpTK2aa9FuM+LGCb2RIaKJjZo4llk9q89evMt8j11HLTC2HllyGeCrEQ68GD
-Nvbt/k6pfBIFhX0/mE+EqipRvValz9tDhkEWKgoD49H0JZtePcTN1g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-38.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-38.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-38.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index f45c1d75..00000000
--- a/swamid-2.0/nya-38.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-38.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI7URs2IkOEeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQwWhcNMjIwMjE3MTIxMjQwWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKSrh71WpRxHpc08bzB/P9B5z9ueXbeoi09l0an2X89D6G01m940MRASUAhyWZ6mJucMA0WzvvPxU4uAvOijtKcCAwEAAaN/MH0wHQYDVR0OBBYEFCECWB8zphKePP+ERDZgfRysSxFnME4GA1UdIwRHMEWAFCECWB8zphKePP+ERDZgfRysSxFnoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAjtRGzYiQ4R4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEcOTYYwlM3fHQeur6GupnQ9qF/IlCgFFvZeEdCF9y0hj+YvdGaAFb6MYhkO+eQ6fpdTLW2hZJ+r/1jr9miB+OY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-38.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-38.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI7URs2IkOEeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQwWhcNMjIwMjE3MTIxMjQwWjAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKSrh71WpRxHpc08bzB/P9B5z9ueXbeoi09l0an2X89D6G01m940MRASUAhyWZ6mJucMA0WzvvPxU4uAvOijtKcCAwEAAaN/MH0wHQYDVR0OBBYEFCECWB8zphKePP+ERDZgfRysSxFnME4GA1UdIwRHMEWAFCECWB8zphKePP+ERDZgfRysSxFnoSKkIDAeMRwwGgYDVQQDExNueWEtMzgubGFkb2sudW11LnNlggkAjtRGzYiQ4R4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEcOTYYwlM3fHQeur6GupnQ9qF/IlCgFFvZeEdCF9y0hj+YvdGaAFb6MYhkO+eQ6fpdTLW2hZJ+r/1jr9miB+OY=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-38.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-39.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-39.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index fafa6ac3..00000000
--- a/swamid-2.0/nya-39.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-39.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-39.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-39.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-39.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMLcJQTcOQe4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQzWhcNMjIwMjE3
-MTIxMjQzWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxRuOde0c5007kuNLqN1U8mazMDFdOqZv
-d2bDxZGnLS0NNTXMStl1hsPhyVroghww4L32bcExrJRzINiuSAgS2/FQpLePadUg
-VH8XFYUZ44LGMi5HiZT/KFHzhUKh0cAcVa5H0j56U9Spa8qZ676rQbRgDvqoZNFQ
-HeczAGJO4gWbDmizi/XpLTzF0ZgfyzDeWz2iWzhVVHJef52zdm6AzPbnRtFxGo/+
-8PwYwPjz4UNsc8OdbwfPef9K4y/deRjbdsra/hK+H8WsVcq1g8vHDBUfQx2OKqU0
-b9ERPMNzpnxiWXZVSWcUKCr3CuSidP//z7hWU5HEgfOiH0cxYhXg9wIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtMzkubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
-OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSBGatPPZBVpZ+cSY8H
-fMSnWVbhYjANBgkqhkiG9w0BAQUFAAOCAQEAkscP0NZHe5qQxLYmymiLlDOoHDYH
-ackMPk0XEAUK3oLizQ3yE9/YwHUiCtXg7xvp5pzFirUq2c7KGxHS2FiarP+Pd+s1
-eTfyjoSxu9Eu78nges2OpVSC+MQFjR7jcnLVU+GLbYmN38y+E/9NG2Y1umgcO8G7
-09UeqdovmgYWO2dUBjrYNDN/+8AsO8Ly9fSRNB52EAsEiFbWCj4GTg5vRXSlKr2l
-/dCS+9rYpteuvwwFT8is94d0gxcESdr3ZtI8DviO/2s/hQp/9AhRQY8PZKc9ESXo
-DeCin/leSnPSxZcR+pWAMG1nG3SVFMbBI6uRSvx7GtU0Cd41IOTyUq+1gQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-39.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-39.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-39.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index dc7a105b..00000000
--- a/swamid-2.0/nya-39.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-39.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-39.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-39.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-39.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO10TaoUu9D6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQyWhcNMjIwMjE3
-MTIxMjQyWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjQ6r63BY76qu3oy4fcswEcNsUAwN00Q
-INZ3U67sh2j346RydW48WEGTn5I2RthUcvcrnedkTBIRgiBg8oVfVaq3NT+vRpP2
-ZbLGC7q5YS4fQaXZpfOon4D6jqnFutLo6L/0MIKyAbvrNyPw4tJkZ+1IagzN60pc
-LOU7tRgFCabKqdbLxqfE7eZC6rHnnTuRaAs5TQPZRPbScCtlbYgWh5stkrXULHbW
-2LUGKcfl1Zpsk5j/FKvfPBnLOPYPQ+9P5Npjyc6ZDDQ+cpLT7hJm53dhOIRlH+AG
-3BTMyn7T9RWWvGn6N3zyA9m3X8OPAPcgcdHGA5h+i35SNeqJUAiIvQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzkubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTY7jWzgf6BnAASQS6eNsGR
-2GV/0jANBgkqhkiG9w0BAQUFAAOCAQEAQ+Lxx16hUR19sA2GA1UpNxOYEUUkZ+Ct
-Y5ReJcqDIFF1c8+PBeu6+fLNv1uFPVBoRRuYEDQd/z1MFZ08TYhBbhZtPW9eHeF4
-YB1M2wPdT8xcGQZCR+4l2di/pnAEs5HjIvk6ZHuB+MRjAVPRwdYntvrjaoLjiLrB
-ND1Un1E4WkcL3aK9VXLhuRDje0n0F2oKJXTVxCkGM0H9EdI8rqFOfjdNBI4xfSmw
-gWKpQ6+QGURDc1X8jypZjqk9TvCZSeLVYFJIHm0UwFLJX13d4SHqv8izwISCI4I9
-8dM2YmZ+4QZj9w9J457iOD6fmJ19Rs57D7ocWtLjeQ1SRkX0+3RPLQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-39.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-39.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-39.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 86be0a83..00000000
--- a/swamid-2.0/nya-39.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-39.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIPXenEcg5tiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ1WhcNMjIwMjE3MTIxMjQ1WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyASmHnICIEwqZeR9WdVOl9dzIsLwn8wiKpOlL5On6CEhOeUTOo3LeutW7zYGRk5Eg6Rrpdsm+l6E8L/3jmS7UCAwEAAaN/MH0wHQYDVR0OBBYEFNC4n78VymxPhS/PPLrtUmf4rJbeME4GA1UdIwRHMEWAFNC4n78VymxPhS/PPLrtUmf4rJbeoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAg9d6cRyDm2IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADONFz3WlNibvfBQT7y3sGC0g5qWSRpzlsn/x1R+KrOF4Rek69+SiyharWbFcyvrN692VMeHJFlanx2AMc8RsMI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-39.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIPXenEcg5tiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ1WhcNMjIwMjE3MTIxMjQ1WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMyASmHnICIEwqZeR9WdVOl9dzIsLwn8wiKpOlL5On6CEhOeUTOo3LeutW7zYGRk5Eg6Rrpdsm+l6E8L/3jmS7UCAwEAAaN/MH0wHQYDVR0OBBYEFNC4n78VymxPhS/PPLrtUmf4rJbeME4GA1UdIwRHMEWAFNC4n78VymxPhS/PPLrtUmf4rJbeoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAg9d6cRyDm2IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADONFz3WlNibvfBQT7y3sGC0g5qWSRpzlsn/x1R+KrOF4Rek69+SiyharWbFcyvrN692VMeHJFlanx2AMc8RsMI=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index c3d3139a..00000000
--- a/swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-39.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL0oFTmh0vb1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALdajG1txEb7uhJXOjXVtbGMcoFOSu7XbT75I0Df8Notv1mDf7OQuW9h3BqMK+pkO3yGZM5FeoEhTQwHiHgRhPECAwEAAaN/MH0wHQYDVR0OBBYEFHK5+JrJOSV1wh8d9vJiSBo93rVcME4GA1UdIwRHMEWAFHK5+JrJOSV1wh8d9vJiSBo93rVcoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvSgVOaHS9vUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABD81/mWxeSu6+rIJ4IxmZR+Io2hRtrT6JlxwiHzz+/e4a7mWjteog52eFkDiUgU5OFdIhFWDQ+NRzWbUulkXD8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-39.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAL0oFTmh0vb1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALdajG1txEb7uhJXOjXVtbGMcoFOSu7XbT75I0Df8Notv1mDf7OQuW9h3BqMK+pkO3yGZM5FeoEhTQwHiHgRhPECAwEAAaN/MH0wHQYDVR0OBBYEFHK5+JrJOSV1wh8d9vJiSBo93rVcME4GA1UdIwRHMEWAFHK5+JrJOSV1wh8d9vJiSBo93rVcoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvSgVOaHS9vUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABD81/mWxeSu6+rIJ4IxmZR+Io2hRtrT6JlxwiHzz+/e4a7mWjteog52eFkDiUgU5OFdIhFWDQ+NRzWbUulkXD8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8452/idp/profile/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/nya-39.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-39.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 817a216c..00000000
--- a/swamid-2.0/nya-39.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-39.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-39.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-39.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-39.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJjArZh/JXITMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ0WhcNMjIwMjE3
-MTIxMjQ0WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3R/zBO36T8LTYNtsSTkFiK4UM9WO/09H
-tR5othmBfyejrgLdki+TZOwDDrZsGuTfEmsubHFAbecz2naJHFGf/7rv+MgADxKf
-7ubEOKukrTUVqpcaAOwkQEfSPYm1QG2PNAovQ7QrA7ChppWp5Q1pPqE039byRmqV
-4F06QEr9alSLjWWQA15Q9N5wxgtqw5vApPJQuOw4OoiDVL6uw5abPJptCQsnBsCP
-ZsYeaMupSYIhFKRpebqlmZGLcGZnnQ9bJMBg6zPGiwoyGQgWL4zU403kQ0IWQzZn
-4SlL1SauhWFuTIoH+mMtl3QDrih3yhIZ92t1LyU/VmnLy3JFYqQj6wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtMzkubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQa7zVksD7/lrhwaeSYaMIo
-EAO19jANBgkqhkiG9w0BAQUFAAOCAQEAZ1jHAC1x2kb8W5A5UNtz5qHmD2NulsQ1
-HmQRlhur8f03k1LfnXzoGXmWCvOohmESRRo9bEMJId9IG+4HqVWxtg8Gz+R5/zvG
-AOraHGx8723WISfNeiIiEKfs6B1v8K2TpC49levT7gIDeUoLwC0MobkWkEoSHUSN
-fKbqAtWS6wdtBTJtXpORmSCkDbRWyuzmXn7844aYLmf6hMr+MkW2roQ5/hi2bHaB
-ebXWUlMNQ8JERykWC82NTJDqFyXv/kBm+wIKdQ6/yeMttKRfr3CYToK6Xra1Jg9X
-6ug5IdpdGaubBY76gxkcyXl62c6wIPLvTZ0xQSScuBw4wQp0YDVwJQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-39.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-39.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-39.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 7a237352..00000000
--- a/swamid-2.0/nya-39.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-39.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL7QWW8JnMaHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ2WhcNMjIwMjE3MTIxMjQ2WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALVAkItloTVPfqu0FxE33+p9eI1Y/JYFKZRaW7UK+lbHNRlPK5kf/bFqhnLabZZrppP6ZsoW7Xq/EjkCeMwm948CAwEAAaN/MH0wHQYDVR0OBBYEFADVgAWH6cDxy9gXC5rMW2rWyQxwME4GA1UdIwRHMEWAFADVgAWH6cDxy9gXC5rMW2rWyQxwoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvtBZbwmcxocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAASA845YW++b6UhKU5Y0WWSUThNGco1CsIWAzV/ALdASRsAI6zYpzucrMiSyknyW4upCXzBi7nxGpXeo9BEoXyQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-39.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-39.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL7QWW8JnMaHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zOS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ2WhcNMjIwMjE3MTIxMjQ2WjAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALVAkItloTVPfqu0FxE33+p9eI1Y/JYFKZRaW7UK+lbHNRlPK5kf/bFqhnLabZZrppP6ZsoW7Xq/EjkCeMwm948CAwEAAaN/MH0wHQYDVR0OBBYEFADVgAWH6cDxy9gXC5rMW2rWyQxwME4GA1UdIwRHMEWAFADVgAWH6cDxy9gXC5rMW2rWyQxwoSKkIDAeMRwwGgYDVQQDExNueWEtMzkubGFkb2sudW11LnNlggkAvtBZbwmcxocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAASA845YW++b6UhKU5Y0WWSUThNGco1CsIWAzV/ALdASRsAI6zYpzucrMiSyknyW4upCXzBi7nxGpXeo9BEoXyQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-39.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index a7ece519..00000000
--- a/swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-40.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-40.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALUQAcCizerIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ4WhcNMjIwMjE3
-MTIxMjQ4WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArLEifVjXNxe1n1So0nglaFe1WRfBajfF
-YxyoDPNCKUjABlEloGYJX5xFI58JCjCdB3tL5qtSrynGMAsXH+uZZIsE6tDeu/N9
-mPgQEskDEpK9vwhZMjxjm9uB3u6wTcik0EzaY9Su+qkdydu4jgSs+jN1htBYNdoR
-iSdviVuYZdoMfY1iqG2lHoJEcPZ2rw5tmqcNC68KKCXZU6hJ0jO8Iy/sj+jZjV2D
-Uv52TBwcTF28/ehZSZh7tWNpSZek6YL8tC8qDTBF9/bV5FBs2InbLp+4jr50BVsd
-mTrmw0hqtxHcZfX6iCt8kIJcR6gKhk7Ta1/gs08HwjWA8SJSZuDISwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDAubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSF4APs2/Z27aDl4bZy
-HO7h9mgcSDANBgkqhkiG9w0BAQUFAAOCAQEATg4TgWIjDaLi3odEn5uq0t5Fo5vJ
-Qktsx2khtqebj0bMpYJXrt32V+syTmEYCcpRaCFIc/rrR7BzFaGzpTKZCcuJ9iGn
-zn/2O7Ir83FwYgzAk/H/uWstTU1kwEPln7ftkQjOpRUUNue5yicPioP4aHsfAc+p
-TrKP6iTnk5j/6/bbb6ufpK9lSF8IQZa7c3/jr+wCt64IgUw6xZsrocjFLZnlaT6V
-q/uvja1ROVq95gYP9wQBTzxL0qoHam8hkAVHtix0hThK4Z1xar5trAEoL6n/FNVk
-5esUa0cDupBnQ5i1ku0MtO5zSrix0MlhKIdLtFzeprZe0cfxaupjyeVEVg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-40.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-40.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-40.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 08a8c570..00000000
--- a/swamid-2.0/nya-40.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-40.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-40.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOXE1rJGIXCrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ3WhcNMjIwMjE3
-MTIxMjQ3WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwkkgiOrPltNtgVVmA6EgnOPR8tfAnqSd
-dR50DXYIOara0Vwv4JUEh1BVK837osvQfSrfz/Mk78HSSY8wC4gXIwaq4M/+RgcJ
-RLxdxI2yJjleYTwFYdhldYyJYSEhw0XNSEX0FCaSnbVSI37IeUJ26jiDmntGQcf6
-fJKuSep2tEgjn2cb1NfB3DlZam/Ozta+xqebIqqwEeqDCo6l/HQ7AF31W3veoExY
-5ZEfmD6Y4OZxBFZ2JrQuBNtZQYHcwVrrRwtsr099YxfzTf5YtGDQucAdlymqXTvz
-YORWwsUOEJOoza66B2AsZ58eEn3nuTdJ0YZaZxdpzzQsExUFXRzNdQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDAubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRNBWw9d9cq1dnmWEpLvRcH
-0LeGrzANBgkqhkiG9w0BAQUFAAOCAQEAt/+hx/Qczh5MNuYLO1UvYtv/qFM2LO6z
-d197KPQZu6y2yCRy1jbiGzKvSu8zg9e3qrm4umGYw75PbgThoxorntuRLPEvxk/R
-YG1ijO7gTFeqh+JaBUrKc0fe6hBfh9zXZCCyxXDF17ZQJUNXRK1LpOgwWudZkcuc
-iC9SrpunoPWqzAtFB3Ide8WGiDTCVqJ0hJ3lRiMmdD407Clxa7qr8fUsTYHuyarW
-51FAkWbd7U5+FA5TfkAHOW/yKwbyVhsr7kWxU3u8gYiMTUrp/gfPmDK0nuR90bcz
-Nm6Gio/u8sR3+Np9/lcNdZq221jLHIzaf27PaWfZQO0yVE4/RH/0/g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-40.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-40.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-40.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 0e288dae..00000000
--- a/swamid-2.0/nya-40.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-40.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI6RtLz879hzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUwWhcNMjIwMjE3MTIxMjUwWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALmaZsjh/+I86BDif6E/ZTau9abkHNjI/B3wfj63m/wd42pEnF7zyb/cgfozIcKrRfJ5sUutikljMnPXK3yYxQcCAwEAAaN/MH0wHQYDVR0OBBYEFIH9zBGKIQGgTyMC61sO6vMl5gphME4GA1UdIwRHMEWAFIH9zBGKIQGgTyMC61sO6vMl5gphoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkAjpG0vPzv2HMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJQu+1fRJwRUaQen2be6Uyk0l40EE96ts1fZ78VM6mbSrLAw1zVf82pKkB3WHtOWWs47uC/OTv7rNQD5nYeufg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-40.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAI6RtLz879hzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUwWhcNMjIwMjE3MTIxMjUwWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALmaZsjh/+I86BDif6E/ZTau9abkHNjI/B3wfj63m/wd42pEnF7zyb/cgfozIcKrRfJ5sUutikljMnPXK3yYxQcCAwEAAaN/MH0wHQYDVR0OBBYEFIH9zBGKIQGgTyMC61sO6vMl5gphME4GA1UdIwRHMEWAFIH9zBGKIQGgTyMC61sO6vMl5gphoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkAjpG0vPzv2HMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADJQu+1fRJwRUaQen2be6Uyk0l40EE96ts1fZ78VM6mbSrLAw1zVf82pKkB3WHtOWWs47uC/OTv7rNQD5nYeufg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 01fda788..00000000
--- a/swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-40.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANLHFWDc9uZ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALb3r16qOdyqvWbB8/NgumaHE+fOX+AqQe+S+6/AEB8bg9rS4PnLNF16I4guhjPlyvLihvWUp0VBN8FO9Tnb+K8CAwEAAaN/MH0wHQYDVR0OBBYEFOAETL3KWLItawiXBbda0NfSy5HhME4GA1UdIwRHMEWAFOAETL3KWLItawiXBbda0NfSy5HhoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA0scVYNz25n8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAK77F4uvHMutIsFd7N2d8p8KnTpp9nrNuKusdnyPqrlq/TNwnHsJqNv62msPLARX1aEefLpwL9ZTvy44b66uuGk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-40.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJANLHFWDc9uZ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALb3r16qOdyqvWbB8/NgumaHE+fOX+AqQe+S+6/AEB8bg9rS4PnLNF16I4guhjPlyvLihvWUp0VBN8FO9Tnb+K8CAwEAAaN/MH0wHQYDVR0OBBYEFOAETL3KWLItawiXBbda0NfSy5HhME4GA1UdIwRHMEWAFOAETL3KWLItawiXBbda0NfSy5HhoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA0scVYNz25n8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAK77F4uvHMutIsFd7N2d8p8KnTpp9nrNuKusdnyPqrlq/TNwnHsJqNv62msPLARX1aEefLpwL9ZTvy44b66uuGk=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8452/idp/profile/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/nya-40.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index ef2fa310..00000000
--- a/swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-40.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-40.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-40.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-40.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAODcFomYSLTPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjQ5WhcNMjIwMjE3
-MTIxMjQ5WjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwzA6u1A91BAphAM6jHimrOfEd6xbQxKs
-SFqVXOun5a5bhJPjIjw7AN5tTcJZheleRmIRcgwyT2qkSSUSDvjxSRa7pP4xOuAz
-Ndulke3BmAszJxUkvbJaMmDRS13pC/S6XjwfcM9j30eym77WY1+ibchWrJg5UMxk
-f4+uoPVRJC8ELEjU/U+wgj6ctUm/xr2t/qDekZRoc4SAGBxutGccE3tkeuFl/Ae0
-82H/xgDh8pCPnnAsL//XghX303n2gS7Zl59vbMV74nVKqNP1P/3Yw7pm4waMPObU
-F7/JRHcyOyTtIzDfyEUVDlkh8TQFD0dxRTzVenO1HBN4p+4tRGMVpQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDAubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQZ4WDCudtLR2Z0viTTew//
-NkCaATANBgkqhkiG9w0BAQUFAAOCAQEAHvTIQSXND30IDNBQ7AQxdG0x5y+kgcJU
-ZUaz87TMmP70XmRK/uH9ONsm2IngmoPi1urOF8T14rdyScSLw/FkzIsbYSICnVvC
-yBO1atn/KPnSr3ZmmEzAWZo1FNvVtMLbIMv9OSGTclqJTC9fnZFdaK0AP3fxjEVv
-HzBSSc3T9/OpTQ2ARyPqODpmkP+GOxzpPBjcLV6r8o0cqbU9fsXOHRfaXxaNUCJa
-WUGsJ1Rxrsfct7C16sfb9rvGl26cdtJXsWN+n9VHsuHbObr0zz0EdJ5GxwDany5t
-mDWz1pcSoipCbE/xT96vf388dBYIryBl2nclJCkKKCaoHbHlmvSmgQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-40.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-40.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-40.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index c90cc3c2..00000000
--- a/swamid-2.0/nya-40.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-40.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOc/9gbUJAiMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUxWhcNMjIwMjE3MTIxMjUxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMSZJ23hXEyD96fmPW7JZpwxwKyL8mYGjxKfkaGIdeEVo9qyZaimhG1ICVym12ChN9C13eV8WXno7PXNlCerMhkCAwEAAaN/MH0wHQYDVR0OBBYEFJwkIobyPi4aaJJ8XK9q51C94BIcME4GA1UdIwRHMEWAFJwkIobyPi4aaJJ8XK9q51C94BIcoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA5z/2BtQkCIwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALMoNdHiLIivPqBtRzLgWqrpkpwX6liXi4yb2G0Wx+g0+q6IPFkeJOTTazpq5eXjeTSGaN/tfXtVF+RVV6Vk8Ic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-40.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-40.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOc/9gbUJAiMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjUxWhcNMjIwMjE3MTIxMjUxWjAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMSZJ23hXEyD96fmPW7JZpwxwKyL8mYGjxKfkaGIdeEVo9qyZaimhG1ICVym12ChN9C13eV8WXno7PXNlCerMhkCAwEAAaN/MH0wHQYDVR0OBBYEFJwkIobyPi4aaJJ8XK9q51C94BIcME4GA1UdIwRHMEWAFJwkIobyPi4aaJJ8XK9q51C94BIcoSKkIDAeMRwwGgYDVQQDExNueWEtNDAubGFkb2sudW11LnNlggkA5z/2BtQkCIwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALMoNdHiLIivPqBtRzLgWqrpkpwX6liXi4yb2G0Wx+g0+q6IPFkeJOTTazpq5eXjeTSGaN/tfXtVF+RVV6Vk8Ic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-40.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-41.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-41.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 670e9fdf..00000000
--- a/swamid-2.0/nya-41.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-41.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-41.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-41.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-41.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOIpBjzhwQOVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU3WhcNMjIwMjE3
-MTIxMjU3WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvpbKSNKAEvb2JXCT66Grfp6JI8KrWnIe
-uiokewEp/8ekUVzPtmPrsshZvQC1NYXv7NziU05+gT23GFFjFUWf7t9+e1N184k0
-ckeD2oKdIwRWZ8fraKbmKRvzrK1GkG5yGqq1p4X7zZNZ7Rmeu61W2/0ch4qIGLZ6
-iZ61hc0rLYaDpL1vNUilZQ4dkAkrJEU8lKEk777eYM46dyecps8mbnTolvlBnw8/
-ijs06PaOLRxRjPCSZjAegLpybUgMiN8bMpswwSg5gR2C/78DglSCPCylkhEOLMIc
-MoG1/qHq7fS8PjBAm9P0UWx/rHs8qMTLJ5rQh9aBzAGsnG/A6grGSwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDEubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQDgwF57cQeNTBYmU5q
-97LHtRacwzANBgkqhkiG9w0BAQUFAAOCAQEADqfrN/vuj3aG9Zbcfp1FH8y+hD/K
-g/j3lMPpzhet1aQGDgxLPQRCpZAJPGlZLxQe0mdIZWoehVNdPNhfxhSoO26yiPJn
-0BYQCH13MYbY1W0vKrGHFt8lpCLJuO4BT1uBDRwg0zj+w6XAD+d9Bd8TwyUV6CWg
-/RfH3JT3R5FwE5pkQckX9Q/7RQmfKvfBTHZD5I4H5TtzEgtZtgGci8szGnIqLuLV
-s1U5MZ28HhfjDqooj4JyxY9hJrmlHlGM316/tkR+rfVWANPAr+u2Xiq/mJibt9JA
-WiqKGwij3hl7nF2KVqwcG1YM9NLhyzbrQZHeki6B707IZMNJVCZJsxlw3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-41.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-41.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-41.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 90bb7202..00000000
--- a/swamid-2.0/nya-41.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-41.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-41.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-41.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-41.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKmisBANH3zpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU2WhcNMjIwMjE3
-MTIxMjU2WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAux8OeX+uxkSkdnhUNowovGH90pK1/JB5
-NU8bzpElz1ncp3I3v/m8Hh1Uv7FFXDCTSvbyHFQGYvJVujpmnnKjZpgSepnZP8hn
-lMiXAa8j+SML8kduXf99AYiQiUIVIgQV7xXD1yrzXFhkwTF5suTz9yFAXBv7f9rc
-rX1WYOC0TB1v3qxSvGE8fLGfmRa3nHRapemfnMu0C1gIOHZtWqdSrYw9J17bWfNA
-/zjl5yPEbh+tklvTwL6B5TtffifmqeR3KFPIb3FbxEU9573QX9l+wNsFmPK637SY
-pcuBSshvO8hmjtTqs9d+2KP7BFxZUvGAh0pfRj/WZSVSPJaYWMNf/wIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDEubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRBeDjyEBmPZMeFzyxXMul/
-5cd+ZjANBgkqhkiG9w0BAQUFAAOCAQEAhXNbErVau5cZ7swqVXh2ZSTUBwuJnW1v
-ZUMytBuQzAI4sdaGyD0Tj9GoiSfsmajmh1RvLEVtfjcI+2Qdl/5lP2S0jUorCREV
-3U45MSktwFn+/xlkTK+EQl49JkIbVP9HJjWg8WTtOL/pjopgl8/5yfHoPTYc7PP/
-2Vp8rWieXEwm04GtnW0lrMZb7T/YhrWjLIZiWjo6fAOivdSbOm8iwLgrKTLO/hKa
-yul6BPGFqtLSaEJW8TVABfxWiUlYAp13IR8gfHDlsz0vXxX964gJ/qJzuB0ak/kc
-F1LJsIg9iKgzjzGPmfLnrdZFMng+VTZGjaExWGWNdv6fX5X8KgtKpA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-41.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-41.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-41.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 25e031e5..00000000
--- a/swamid-2.0/nya-41.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-41.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAO47PA0xQWW7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYxx16evE8JgNJrVwEN2YC3aO6WVum6FSFNSPA05IBYCSU4dp8qIkXSs3yLbTMGi55y6jJgiPuoQYThEOTa7NkCAwEAAaN/MH0wHQYDVR0OBBYEFLkC1ViuBeSdNuRpZeVDY5DbjJSdME4GA1UdIwRHMEWAFLkC1ViuBeSdNuRpZeVDY5DbjJSdoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA7js8DTFBZbswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF55ogmFfk/EbE0PBfAURN42UkwMyAQTVu5ZMM3fztaCwvadASi7irSEgnRWnb+aC/GrYSf1/ot19hPjWBLJ4Vs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-41.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAO47PA0xQWW7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALYxx16evE8JgNJrVwEN2YC3aO6WVum6FSFNSPA05IBYCSU4dp8qIkXSs3yLbTMGi55y6jJgiPuoQYThEOTa7NkCAwEAAaN/MH0wHQYDVR0OBBYEFLkC1ViuBeSdNuRpZeVDY5DbjJSdME4GA1UdIwRHMEWAFLkC1ViuBeSdNuRpZeVDY5DbjJSdoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA7js8DTFBZbswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF55ogmFfk/EbE0PBfAURN42UkwMyAQTVu5ZMM3fztaCwvadASi7irSEgnRWnb+aC/GrYSf1/ot19hPjWBLJ4Vs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 0b1b1f52..00000000
--- a/swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-41.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKL/w1UabdTnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMR//D4JOhYvaY2HmZVLFO7PfC6ciMZbuIvKWsNja97EHp4753vPJ7GOZqs50fUHvB6zJYjr6a0R7aJxtrez090CAwEAAaN/MH0wHQYDVR0OBBYEFCAQARq+L1QZok7bOL6j6kjZFHCcME4GA1UdIwRHMEWAFCAQARq+L1QZok7bOL6j6kjZFHCcoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkAov/DVRpt1OcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKtj48V8hyTXIvPRBr5gP6yjEmyanH5Fo3wJVMEzj0Q6OkazP1BzhyMsTlEqWhCVoS0f29RUITZ87H0uNSF8GZU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-41.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAKL/w1UabdTnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMR//D4JOhYvaY2HmZVLFO7PfC6ciMZbuIvKWsNja97EHp4753vPJ7GOZqs50fUHvB6zJYjr6a0R7aJxtrez090CAwEAAaN/MH0wHQYDVR0OBBYEFCAQARq+L1QZok7bOL6j6kjZFHCcME4GA1UdIwRHMEWAFCAQARq+L1QZok7bOL6j6kjZFHCcoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkAov/DVRpt1OcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKtj48V8hyTXIvPRBr5gP6yjEmyanH5Fo3wJVMEzj0Q6OkazP1BzhyMsTlEqWhCVoS0f29RUITZ87H0uNSF8GZU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8452/idp/profile/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/nya-41.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-41.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 1a1795b0..00000000
--- a/swamid-2.0/nya-41.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-41.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-41.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-41.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-41.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO+M2l8RlVsPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU4WhcNMjIwMjE3
-MTIxMjU4WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3LeBGEbfnGL/AR0rliIweP/arzVBAXtf
-fjBsLEeUhv7sxgqi+u22boj6CXsZIW1vINHc0AzwqTv7/8Q+rJS79lxTvqewfgzk
-Q7Og+AItgDXHuXJMtzQEXDhuPCbzrdCT4h9n4ZD0+rraT7/NKkQzIvMYuOQF6433
-rHxI5Cs1risu06ubpqCsojdo4EaWlEoEeFE/KdBP7BpztVwVfGvyXbOIVRfzkgLg
-jmICKA/qXzIpMBa77zaK3t6NJAv5B7YwhXwLsWcxi7DRvAl8PS42JmGaDnGOGIAm
-HQrtA7vMW+4cry/IFRgcHxghdOq8pjlOIps2HeKacKDIng/zRYHtBwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDEubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-MS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQVXJYJfb4gXmHb4+go6Nbb
-zPqHGDANBgkqhkiG9w0BAQUFAAOCAQEAtrsXiIGRJRRXAWx8RCnT9eige+iK8cJ3
-rPGs6Ww4iJQ5b68LX7r+5URzXNyqe6mhdx4tBsEMsipXvzhdQY64SbKalMaPH8UW
-tG8HVayOlZqvQVKton93+fPieyfRunZQrD6+ojfpwoNH1/qzYNoc/cKtbiRChhi+
-CKi4jM4dhE2XlTYVnUEIUm4C6DYA88JrsqMKtpCUYJbrci/sLh7AJZEnr2HH76pV
-cwWToP6KKJrLiHvlGDfSHik+t4ewtg4UI0PUvvznsWpcfewxHLuclWzoHDyzVjJ0
-c/ojHalFbRTgGAzCAsVhKoB/sSFxrfNlrLyStOltoXtL0NTCukgCTg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-41.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-41.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-41.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 0ee46e7b..00000000
--- a/swamid-2.0/nya-41.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-41.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOlIcHBer9kXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuOZSnPO78gASdSBT+E4z0sJQTy9+6mxGLAmywHtazJgAKYWzf3YmVln1SVNIw/s6eut9WOuDvBlhoJJj0vxG8CAwEAAaN/MH0wHQYDVR0OBBYEFMcMODNu1ePYTjNDZlJ65IB/AvvYME4GA1UdIwRHMEWAFMcMODNu1ePYTjNDZlJ65IB/AvvYoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA6UhwcF6v2RcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAETf8zAraudG4HuRgRQ8u4bGOqwWs6qnwvFHriuF4CvAhuRk1+n8B/c1nnPEytMqJDrG8YfLkkWaxE5XLIgW2Mg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-41.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-41.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOlIcHBer9kXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00MS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMjU5WhcNMjIwMjE3MTIxMjU5WjAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuOZSnPO78gASdSBT+E4z0sJQTy9+6mxGLAmywHtazJgAKYWzf3YmVln1SVNIw/s6eut9WOuDvBlhoJJj0vxG8CAwEAAaN/MH0wHQYDVR0OBBYEFMcMODNu1ePYTjNDZlJ65IB/AvvYME4GA1UdIwRHMEWAFMcMODNu1ePYTjNDZlJ65IB/AvvYoSKkIDAeMRwwGgYDVQQDExNueWEtNDEubGFkb2sudW11LnNlggkA6UhwcF6v2RcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAETf8zAraudG4HuRgRQ8u4bGOqwWs6qnwvFHriuF4CvAhuRk1+n8B/c1nnPEytMqJDrG8YfLkkWaxE5XLIgW2Mg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-41.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-42.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-42.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index ccfade14..00000000
--- a/swamid-2.0/nya-42.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-42.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-42.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-42.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-42.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAP5/8hTbsaibMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzAyWhcNMjIwMjE3
-MTIxMzAyWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAva48C7gkXT7b+wZlt2K3SzUJdt3st6iq
-n4tpOYKcEmBwC7Bcd4dry0HPPmzF6e7OXw8IVMrsSnK+jN5x+sU2g/dHRmiASkKA
-pt1tJKMhgxfmGOSmVxEgxMbI0ZoeEK390tpdZrIVkw65yuH3BuUrsj55fKcIspwW
-UooeFJZ4yn31ReqldKqzXIYcpLnnx7Tko47cSmvjvogDMrxx3FL7L/gKngYwugzZ
-HW5h0GbuS/OOSD7WdQdDVB+3e8qafE13aB/GkN1EkRdGv+ef2k4nsGxXbjabOlkc
-hmTQ6BZk5ZmiMaariqTmW8OwqZKgkYNLa76o3ua9tmR0iWCcuP0idwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDIubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTyl6Cma32hnH43rLp0
-EuSWJUI8wTANBgkqhkiG9w0BAQUFAAOCAQEAFAs/QRa8EsRFhVnsUgmzkPjsWJbB
-iNUX+HxGrlF5ItycMsLSCxewO7dYsWOgbE+L7/7gplRQunCr9KoGpmSP1jt4THGc
-mkw6P2pfMpPzHd3rAR9iEPyssVDTW4T/gRM+1Lvya/406An9NLv3468/NiXoTmTi
-E6+Q6jxnEKgGw3qjmO+SvHqm4koTbJ1LVXYGtNlXuRpztfvvBNEm8ACK8orasMLT
-+PTJIp2z3pqodmNpW0ocSaKlnlzFrvYXZ51UCOn4X8okZML0ERPmgGXJIN/Q1MY6
-icUA3oRXGSfcKNiVpOCzf4bzgBNfinbPeaMMgS54xjbaWdTyW0MCzNSmyg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-42.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-42.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-42.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 3a71be4e..00000000
--- a/swamid-2.0/nya-42.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-42.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-42.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-42.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-42.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALJAAVza4JvWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzAwWhcNMjIwMjE3
-MTIxMzAwWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7LXUNSmrAfUK9WibMDjfWlS+lHUWBlC2
-u13rRsOYzprvqYToKzcDjZRaA/fNP1mYJLiXL66HOkkFabkBiqFpre3TpxTgjlvQ
-Dk0RynjBT3NH5tQtWp0VzVzvpKcD1z7qhVT3MtRcWnZ0fD/8w7DkfBvvlUr7QV++
-7Qv4ygq7KLsQ/HA6hcnoBsbs3JS8MnjamfL8qKcmdgurTvqH1pzY/kmTsNrgP9nu
-R6BBeHmkZ5wVtOqOLVKn3AiEeXmGZNZoDi7HkSz5ya4g72Ph/R15qMectXP8fSnW
-3wC1Nav6rORpaW2XxuG25cRKhwQ2ow494w/ZjHvpboWIPq1kJGPrCQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDIubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQ3BXsHVkqTp0DnZqU35sdJ
-kE61FzANBgkqhkiG9w0BAQUFAAOCAQEAWZ6jr/PECvjCUhUgUyg82JHv8LRLfQl6
-Xo5VJuZJ3MZ8p93EGoJ14G58aSPw6atd/dj14Fw7YY13h7UBMiVyeuAjkrvPnTA0
-lTHrKo/We4TeCVcSZtOiSl71dRl1eySPp/3kaefguSMh0gLPdjW+XD/Zz+m0+aBd
-adGnND86YRlrCD0YyXW69TQz5Pp7dBnln79TQOicjR05MSelUHUSQIdCEy83AmLk
-kASYopu1YC42QWEkkbBmokuwMffcdcFncxoxGzzDp85c3JeIjpe5FdSpBO/BKUMW
-/rF5NCfzyiQFzzZkB/906LMjYIfJGBafuVx4VQo/8fQ4KQyTOa3N2A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-42.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-42.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-42.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 72678476..00000000
--- a/swamid-2.0/nya-42.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-42.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ0yGCvoITOrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA1WhcNMjIwMjE3MTIxMzA1WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMZRJ6Szfre7vUSUKc50m6SfXFkiIWdaAIL2ZUHNsBc1jMwZ/Sif1E58Osk5d2k4dfq9YU4KF8Ozd2OoohF2oI8CAwEAAaN/MH0wHQYDVR0OBBYEFFtTXtfBAWG3jO6rcj2KCqJ9urQ3ME4GA1UdIwRHMEWAFFtTXtfBAWG3jO6rcj2KCqJ9urQ3oSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkAnTIYK+ghM6swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGyowxrDMAAVbJUN2sfycH5WAG6PB4G9OIMGGPyiX52SnjA1LqKs38efMURodMyzSxdKVs7NSlJmLWoCdvl2CvE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-42.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ0yGCvoITOrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA1WhcNMjIwMjE3MTIxMzA1WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMZRJ6Szfre7vUSUKc50m6SfXFkiIWdaAIL2ZUHNsBc1jMwZ/Sif1E58Osk5d2k4dfq9YU4KF8Ozd2OoohF2oI8CAwEAAaN/MH0wHQYDVR0OBBYEFFtTXtfBAWG3jO6rcj2KCqJ9urQ3ME4GA1UdIwRHMEWAFFtTXtfBAWG3jO6rcj2KCqJ9urQ3oSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkAnTIYK+ghM6swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGyowxrDMAAVbJUN2sfycH5WAG6PB4G9OIMGGPyiX52SnjA1LqKs38efMURodMyzSxdKVs7NSlJmLWoCdvl2CvE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index e642cb46..00000000
--- a/swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-42.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAO0sRD/nJOjiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALpztlstjf9qCZ5wO0p08p4iCY0I6Vgm6kKBmqLeubThh4OYz0sX3rGVAYeNZRwhaeGLiz4VGfSBhxYG5GaHBBUCAwEAAaN/MH0wHQYDVR0OBBYEFG49b0VuEg49wM91m1OYu64KXHtPME4GA1UdIwRHMEWAFG49b0VuEg49wM91m1OYu64KXHtPoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA7SxEP+ck6OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABocDQGudwgskFiVUjs5vLUMc43XRj1ERPj6RPJw9XUDftSiav8mYDeqIw2cICoD0HKXWK5ebRyOEOj2GuuOKo0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-42.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAO0sRD/nJOjiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALpztlstjf9qCZ5wO0p08p4iCY0I6Vgm6kKBmqLeubThh4OYz0sX3rGVAYeNZRwhaeGLiz4VGfSBhxYG5GaHBBUCAwEAAaN/MH0wHQYDVR0OBBYEFG49b0VuEg49wM91m1OYu64KXHtPME4GA1UdIwRHMEWAFG49b0VuEg49wM91m1OYu64KXHtPoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA7SxEP+ck6OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABocDQGudwgskFiVUjs5vLUMc43XRj1ERPj6RPJw9XUDftSiav8mYDeqIw2cICoD0HKXWK5ebRyOEOj2GuuOKo0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8452/idp/profile/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/nya-42.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-42.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index adb6d4d7..00000000
--- a/swamid-2.0/nya-42.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-42.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-42.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-42.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-42.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL0yZvtbKPdFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzAzWhcNMjIwMjE3
-MTIxMzAzWjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Oc5n5glf5l0pn6+8L2lU4roeQoS55Pr
-5VkI1SYktGX0JcYk9kZiPoHQla3gzgipgAlD6t1NK0DPL2FEqzf7GdKA720f1D6D
-zvSa1PWQbk1u9pSIamt55+XqLibx+4dXbkU+S6knOV44xYf6mQM3EP2gYiM5Tbxr
-KHOsmJoZY7ge3GDbL8WDq+UCSUA4uKJ20/ryXyj0m7QJxBftutyxa+JYwnSvlwSI
-WUTvnew97ArHrmn5Pxwz7WP0i6gm95Sd2u4hXi4Ifsli0QdupkR5bQRA+wt90XZm
-vGsgmOgja9xPjLAiN/SytLHgByfATtevY8IVJRHdL7R1EslbWSp3twIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDIubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-Mi5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSP8mYjkd0hYbfUTQGbRF2U
-uA638zANBgkqhkiG9w0BAQUFAAOCAQEANx3RcwO4nu0TRK++j7nh1OVrLRXp43W3
-W8+Jajp1USLB+URP5qvZE7LEve7cKlgnUXtNHEwa0ShQpegOzMpD4XCNMctobncT
-jgk4PBFQYRpgxI0rNfsPAi3AbDZaJhlYyOh1Nxiqji+/XGh6Ne5RPbxlmDtsMHvY
-s0drFosO/9jBOlAbRMJpJg/rvL3votGZFKRmbA11u8jj4giCRaIhmGJ0vPZeOw37
-vNHjiDrZYd/koyPChOjixDPgW1nXYa2mZ8hEGkE7+WyVMrVLzHgtglwGCaigv7ZI
-oHr4fMXOHMsL8OyM/RrqMW5mc8IOCAQvPNTBrHFndXCxbbeXtqOGww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-42.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-42.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-42.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 0cb12f5e..00000000
--- a/swamid-2.0/nya-42.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-42.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN2MoNMAeSm1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA2WhcNMjIwMjE3MTIxMzA2WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO9ZY2MHygjGG8EI0xPh78fdkQ24X5aaplXm7LujasXQIItwOrUV7g81HQ6/DzoOcIkfQyyv72wAdFacYDqQhoMCAwEAAaN/MH0wHQYDVR0OBBYEFIoneCaEB0O3uprW1Mvp99a32yPSME4GA1UdIwRHMEWAFIoneCaEB0O3uprW1Mvp99a32yPSoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA3Yyg0wB5KbUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABZLruBz99LJ9HgZwP7kDQa4nwgVKlDFBYp1y2C7C3ibrlWUomtjIAT9Tnsl8sGTfj5IRp6QIsnxPQAjkgma8I8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-42.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-42.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN2MoNMAeSm1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Mi5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzA2WhcNMjIwMjE3MTIxMzA2WjAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAO9ZY2MHygjGG8EI0xPh78fdkQ24X5aaplXm7LujasXQIItwOrUV7g81HQ6/DzoOcIkfQyyv72wAdFacYDqQhoMCAwEAAaN/MH0wHQYDVR0OBBYEFIoneCaEB0O3uprW1Mvp99a32yPSME4GA1UdIwRHMEWAFIoneCaEB0O3uprW1Mvp99a32yPSoSKkIDAeMRwwGgYDVQQDExNueWEtNDIubGFkb2sudW11LnNlggkA3Yyg0wB5KbUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABZLruBz99LJ9HgZwP7kDQa4nwgVKlDFBYp1y2C7C3ibrlWUomtjIAT9Tnsl8sGTfj5IRp6QIsnxPQAjkgma8I8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-42.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-43.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-43.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index c379faa1..00000000
--- a/swamid-2.0/nya-43.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-43.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-43.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-43.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-43.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO4d7zmYFGiZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzEzWhcNMjIwMjE3
-MTIxMzEzWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq78hlN+wMpRcpiwHtwQml1l6R6JCeyVE
-gBtPN66KQINDLDrLyhfAchpX2gDT4Hvnp/m7gje330wj+qZli2enIJg68rIFggo8
-2JBZRskqCbEnCgWfRQCOI3GhH0VWfMSZX3HrQVzfhfcWGEfmgMZbrrW7ezBBYHnf
-3PMmWXz/O2d/osuxwzVqIYmsQvcV6zyZtwGDXhBQg5aL+afRD1uyWyvnPhzVlGNk
-VCrl+49AKVPKWcftbnV2U7G4PVBGSJ7dgox5JSfkOn4fnyBwmNwE5Yu7XoCJuM6M
-WBK3YCYKAQ43ZICW7qPoumZ69N8JafKi/5ZW9q7XOQjWTxj6fPRkgwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDMubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTVzkkxulCUwsbRDRkA
-HUZAK7UPITANBgkqhkiG9w0BAQUFAAOCAQEAV34JXTqXQ+Kv43+NctF7OFlI0NB5
-G87tqjO+emOEk06BjtfoHxWj+Avx3lNwqBehu26atF168HMDGXSkfxk+GIWFc7Nh
-/yBLatwr2xy5jRs31myM0OqoUfQMZNRCcQE91DjSNGy3VklW9vBOK0aG69QrX5x/
-cVHQsh1GbU5t3SGEmvZVvvX6qUAPjo9F8AKB5TKavB27Y4VY7SxWO+ENj/HumfwV
-c597AGS4H2xOXmmI9qDYinzxicaV8axaHWT4YsU4KJSsWhJ6GohJSAFluB1sWbfX
-Qk4TWq1KXxxg0O/3jwNuOIN/UiOJhstNsOT8zEBsPAdGsrcsM4j1+kSEWQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-43.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-43.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-43.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index aa06d2b1..00000000
--- a/swamid-2.0/nya-43.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-43.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-43.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-43.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-43.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrQdtJZooR6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzExWhcNMjIwMjE3
-MTIxMzExWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwxlrsn+V+5HB/+FxZyokkiC2eEy6U9cn
-PCSRjn/MdG4dEyCkT8qqY5EGuwkI4pMf1HW6Jy4xoD+cKcckIHLcPRtV/bIgXqHS
-OPwVYTmdwSjlED6QSrwR65FBr4VfoYzPgelR7JnPeRKavXoSVNzZLhSkEYgBzHMr
-is6ffwP9hS5BIySkIC9bsjoiAkpY7hoBmZvymfnc8vyseMqv5zLch+pgd++AaFOj
-Wjbwf/exxwqAd1hxtJLoVEjH1FMQz1p7tgpkTRRe0L8p0UyXnEeI4zoDlKbBroQD
-Oku3H02EAn5YQGybWYecQsxF9KHcnDgTkNkghIZG0i1jVv+a0S9TTwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDMubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS79A1N0Cqde6qV0IYiFZrm
-VG8vtzANBgkqhkiG9w0BAQUFAAOCAQEAi3MGPMt21P46I6u7T9+fD0Rf0kmoxnDS
-F3vFhtQXSGqX6T7fPX5lRojoA11w71kYK/LEzyDNjx3vAwp92tycoDQj1hAO6AkV
-W9XKNG5vcrkh5RPY9/PBUGrZnCwju2JLCRmVuhMkVMzZs/O471DV0EWT+l4Y+sl7
-0gMEooINBV4dkXxzc/uPDsJCf1Io5lluipGN6j7l1v5VN67pxVuGaL1N9XlfWmF6
-OQ5FOXvsd1zkvM52OCxIdF9VHHY6Z/SbBYtvK6w/gpNl1JR1qgzIRQA2VaJZiUnn
-zNDBdRUT+W98qJsXKqTDiHE3ocuYXcy++jEb0Vh0rpMS3VcDXkhEpA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-43.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-43.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-43.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 5f8a0a23..00000000
--- a/swamid-2.0/nya-43.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-43.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ6doJWCMqbLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE1WhcNMjIwMjE3MTIxMzE1WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9EZ/kE75zTo9XbcFt6/3nfo++MbtDsFx67sZE9UUpan7D09276+Hz1wWppWthcaNhTWu6TnDgtqljpmKhsCqsCAwEAAaN/MH0wHQYDVR0OBBYEFEF5jvPXMcrGM0QhXuCNOWKgwXQWME4GA1UdIwRHMEWAFEF5jvPXMcrGM0QhXuCNOWKgwXQWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAnp2glYIypsswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhotXbvDC92vbkA0ltT55t0vpvK6mI21yfBkKxzdT7OLs3+6woIq86c2eTqrhF9yMJlvsca3chu93b9oYDY/6w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-43.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJ6doJWCMqbLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE1WhcNMjIwMjE3MTIxMzE1WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL9EZ/kE75zTo9XbcFt6/3nfo++MbtDsFx67sZE9UUpan7D09276+Hz1wWppWthcaNhTWu6TnDgtqljpmKhsCqsCAwEAAaN/MH0wHQYDVR0OBBYEFEF5jvPXMcrGM0QhXuCNOWKgwXQWME4GA1UdIwRHMEWAFEF5jvPXMcrGM0QhXuCNOWKgwXQWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAnp2glYIypsswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhotXbvDC92vbkA0ltT55t0vpvK6mI21yfBkKxzdT7OLs3+6woIq86c2eTqrhF9yMJlvsca3chu93b9oYDY/6w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 76aa8a57..00000000
--- a/swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-43.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALdu0Jo7ZCEGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJhciAtL3YtCXvZaygjtqVIeEAdGl4w6mP9psXtPV4JOd0J6PdjCkLUszEBME3oMEHcB++3Hjetey43aduS5zLECAwEAAaN/MH0wHQYDVR0OBBYEFFYVIrJjsh5QcABLmEnRLoB5FuoWME4GA1UdIwRHMEWAFFYVIrJjsh5QcABLmEnRLoB5FuoWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAt27QmjtkIQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE9cybFyOn2f8wQKnpf5NWo9WDltDh9aLoCw6Vj6zLHrO1sXhcRPcsB8nbUJ+Mpl8fh19ERYvpDWNzlNYipS5EU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-43.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJALdu0Jo7ZCEGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJhciAtL3YtCXvZaygjtqVIeEAdGl4w6mP9psXtPV4JOd0J6PdjCkLUszEBME3oMEHcB++3Hjetey43aduS5zLECAwEAAaN/MH0wHQYDVR0OBBYEFFYVIrJjsh5QcABLmEnRLoB5FuoWME4GA1UdIwRHMEWAFFYVIrJjsh5QcABLmEnRLoB5FuoWoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAt27QmjtkIQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE9cybFyOn2f8wQKnpf5NWo9WDltDh9aLoCw6Vj6zLHrO1sXhcRPcsB8nbUJ+Mpl8fh19ERYvpDWNzlNYipS5EU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8452/idp/profile/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/nya-43.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-43.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 3ea0c913..00000000
--- a/swamid-2.0/nya-43.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-43.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-43.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-43.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-43.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK9d6g2UVDfYMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE0WhcNMjIwMjE3
-MTIxMzE0WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAykbelaWvwyFW2CyEZH7e7QZCAJG/VLdv
-ivF5jjzT48eMMR9DKFjIgpZrnHsRdZZr9zkzd9HVl9PhRQiq4besjN4Ygl8L3Cky
-CGu1zb5vWl/CpZkRsnRVfBsmxEvNgzN1I8dZ6gzp8joVTBcla0TWov1v6Rz9mKvk
-SZ+4iUeFeUyXdA6+U31VypPlo7NV2AG+eWGtvs9zVMZFM515pww7HFVISKV/xIMa
-uMnaqVq2jBk2d+BozsxYsDQRhR/Xjpaye4IhikO/SgxTVNvZtrWnv+ZDubhMZnVq
-UIXijMbaoQmHGT9NAqBZe5nlIHC6cWcnAVrJq0Bd1w5dMImFnpQW2QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDMubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-My5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBRc2Y+V8Y+M37rOuvpkB8US
-kUUjQzANBgkqhkiG9w0BAQUFAAOCAQEAK1YSL9JBU5ooZhk/w4A1HLyxVrFKmetF
-4Wj3LIMxu/7u0wlq+KiBHh/hSldixg0UstQ//koBeJ1IrXq8U0bbIruETm8HfiAa
-KxqIhpF95Mxa3Q+33cX3ksJIoNLGZbkz2AR0FpahVZFzwYnEUSRres4hMb8hRiU5
-CIk4u0/r1AtBTjhNcVExwtYyMZ03LRpIFxMn98IYphsP6BzjPem9/b18+XaLvnki
-X811ZEKFXoeiSvbKSZjWlQ2Eob+X8zjv5jPD5iYqgkGPh4zHbOLAOGja2wqFQApm
-9+uWyD7kv8f6iruYY45PmI6cbG02W52yHRZhN9k11fRRlOTPqJCyxQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-43.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-43.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-43.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index c54a0152..00000000
--- a/swamid-2.0/nya-43.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-43.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJuE84z6RBOFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE2WhcNMjIwMjE3MTIxMzE2WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfaSEjacLKstuHfk5y4IuCCuebZjix8G2sFuG0rP6qNPpA0mgoNfn5wmXSmtQx58HxdQIf3xycVeCkYX8bwxikCAwEAAaN/MH0wHQYDVR0OBBYEFKu8yOVKH0oSonrBWACWhAHXnAuAME4GA1UdIwRHMEWAFKu8yOVKH0oSonrBWACWhAHXnAuAoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAm4TzjPpEE4UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKsXZdTjM/jWFh/SegFsQHkp31CLfmHHIZ5CTYE5V+1giWgDQmiIvr5pRvMgHQIai15dffxoq2rPPl5mpb07iVQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-43.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-43.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJuE84z6RBOFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00My5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE2WhcNMjIwMjE3MTIxMzE2WjAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALfaSEjacLKstuHfk5y4IuCCuebZjix8G2sFuG0rP6qNPpA0mgoNfn5wmXSmtQx58HxdQIf3xycVeCkYX8bwxikCAwEAAaN/MH0wHQYDVR0OBBYEFKu8yOVKH0oSonrBWACWhAHXnAuAME4GA1UdIwRHMEWAFKu8yOVKH0oSonrBWACWhAHXnAuAoSKkIDAeMRwwGgYDVQQDExNueWEtNDMubGFkb2sudW11LnNlggkAm4TzjPpEE4UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKsXZdTjM/jWFh/SegFsQHkp31CLfmHHIZ5CTYE5V+1giWgDQmiIvr5pRvMgHQIai15dffxoq2rPPl5mpb07iVQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-43.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-44.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-44.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 17682d47..00000000
--- a/swamid-2.0/nya-44.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-44.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-44.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-44.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-44.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKf9jb7zQwXrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE4WhcNMjIwMjE3
-MTIxMzE4WjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAygrMuMIMN0GSRsQmTmQ2pyFWpHSDTMAH
-trGhZZNxz+KyDaLL5+BIuu5wY4jGoPuCJeu4CReog4mOEm/O9Qsiv295PvPk+o2n
-966gNpttApjw7d8+yafs02c3z5lkOpysP7olODDkQd+sRzd6tbZcTX+IzkdVDzXa
-Hjs+GNHvItvucAIWW9CRXPIxff3IA3C9kvtL4YcxXVhd1dwUV9kOuhw1oXlnpXjE
-aM1NJA3laCpA4ipQQfrCu9f0dtNZGKzmsthQH6O3kzTpGFrQjojh3J6pvFnxQ/UY
-rNitjABBCm3rZtDS6jfHAOUTrj4Pmv96Rh3IlJwZgTW7pEzSNG9+swIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDQubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQ5coLlijaoaxxkjcOH
-h2Y5z+4gWzANBgkqhkiG9w0BAQUFAAOCAQEAEsQnqfuhXD39wSvubErCLDYR3dyh
-hK97728Ox7AMijpp0f7CntjnkjzyyFzGJsBPmJsE4g11fZotnL0xwitvWFG7dGbE
-jEshYXEbp2RPh/XH4lAdOpVyiHw4dWo5EePVL9RDbI+NalX6CWdZN6ochz0nJX9f
-nB/kDwpzgeNGDGCOOpMMoRMr55P3pBMJJA4RBqN0cLqr/YU60Z/+nBU68XIo+/2h
-wO9uEbB7j6r4dXxtLb4tan/8PFJHeaa8Dx3E0iaMYl3Qq+XKyYK7tUTU2QoPA1Bx
-aelVb0hk4jhW0bdZYAr/CHx9Cz6CYCNOrToU2ugV0clcsYsMhxsMxCqX0A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-44.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-44.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-44.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 3ec1e6ea..00000000
--- a/swamid-2.0/nya-44.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-44.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-44.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-44.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-44.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/BdVBxTmtfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE3WhcNMjIwMjE3
-MTIxMzE3WjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxKpXC+2COQ9atnvMPazMLOq3a6NDJy53
-2jxAE5gM2nRXUbSnQCSZoAAjS8hAjOJZqVjk6eoqfDUJIaOTsLkKRDgVFOzBZI2q
-fQcyzA8ZA877Y15vCbVgkuu2HXCnxN0BvIYL35rSSWFtPH1C/cZZsYVwtT80bYUK
-6bV/3q4OiaOlhkYyHrCyXTpbGiCQzq5zEr3wMJ/QBRTf93wZN63Ah3yjySKDn1qy
-rb4qHneGZ34uNbPc6Y3YQ6FsE33l6WHOSoiWIU6pgMFjUzubBbmvWWOHKdFGydgq
-Pd3RmjRYV89vit/2A6VL+Vb9rsv8HFIjrfvFZsTPQ94juYm0j6YBXQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDQubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBS9Bw7fP8+3T1mgZx0T3a86
-vrR9dDANBgkqhkiG9w0BAQUFAAOCAQEATrQffgtNdmyuthxkI63JhrjpaC073QmO
-Vsr8eoINWql2zWYoqSo8Cjl/Wv7g5l5Pj/O6bI0UIDdYz3TFPPfbXMKZGT4V+dxY
-vXeMKvyNMBXQVNfr0PyInZZjKzNtAMsCL50dpJ3B7ucR1iIzJRBZIJo4IdA1tKUf
-7QQPWwEWBELBMeGjT6O8dEQEGI9sTT6UCtXWdEzuJ1an2HK8BjGHsdE2D03pYs6r
-/RinoOcCCmMeCj2bk8RNaMDMEc3d81UQgzfZT+anWYxjk15uddmAVYiFjA981ZLM
-5j7g9hv4Cows7qPjlPVvJdbtFsugApbEgfMsH/D7JcO7nS8rAIAF2g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-44.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-44.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-44.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 315db662..00000000
--- a/swamid-2.0/nya-44.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-44.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANVcfUG+C/8mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIwWhcNMjIwMjE3MTIxMzIwWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALF7V1OAwQx7BmdJYpwuUyj96k87cH8RJxs+IU2l6vUADgvIQO7lTO5CjnboqR33YeED4sfMBLvqwV05cmicKr8CAwEAAaN/MH0wHQYDVR0OBBYEFFeUYrIYLRwBGy+iniCS4g5vFgFPME4GA1UdIwRHMEWAFFeUYrIYLRwBGy+iniCS4g5vFgFPoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA1Vx9Qb4L/yYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALEPlOmeCxwnVNKG/sl4u8JCs6itERTL3EKCacyuYhcp1aUX7SvqcN0o6FIfZ6d2Or3l6smb0wt6YUnFOZbPu6o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-44.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANVcfUG+C/8mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIwWhcNMjIwMjE3MTIxMzIwWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALF7V1OAwQx7BmdJYpwuUyj96k87cH8RJxs+IU2l6vUADgvIQO7lTO5CjnboqR33YeED4sfMBLvqwV05cmicKr8CAwEAAaN/MH0wHQYDVR0OBBYEFFeUYrIYLRwBGy+iniCS4g5vFgFPME4GA1UdIwRHMEWAFFeUYrIYLRwBGy+iniCS4g5vFgFPoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA1Vx9Qb4L/yYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALEPlOmeCxwnVNKG/sl4u8JCs6itERTL3EKCacyuYhcp1aUX7SvqcN0o6FIfZ6d2Or3l6smb0wt6YUnFOZbPu6o=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 3219b227..00000000
--- a/swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-44.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAN9dhhAV/cp2MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM2ESfeAyrpMhCniantsxC+CrJLURsUaojWa29wEbS1yoCCIte5Jzme7q8wjmHGTgXDRBSecdey3FXUAkbrve0CAwEAAaN/MH0wHQYDVR0OBBYEFOG5sjrD1YJqFY1Sokjm45hC5cleME4GA1UdIwRHMEWAFOG5sjrD1YJqFY1Sokjm45hC5cleoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA312GEBX9ynYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJByL0c/44B0iJAj2tftyI7eggsYhu3bvcUo0BiFpglrysDSVX+BGssuXFxd3ND0YRXO9IWS4+CvL2DtVmFeFVM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-44.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAN9dhhAV/cp2MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALM2ESfeAyrpMhCniantsxC+CrJLURsUaojWa29wEbS1yoCCIte5Jzme7q8wjmHGTgXDRBSecdey3FXUAkbrve0CAwEAAaN/MH0wHQYDVR0OBBYEFOG5sjrD1YJqFY1Sokjm45hC5cleME4GA1UdIwRHMEWAFOG5sjrD1YJqFY1Sokjm45hC5cleoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkA312GEBX9ynYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJByL0c/44B0iJAj2tftyI7eggsYhu3bvcUo0BiFpglrysDSVX+BGssuXFxd3ND0YRXO9IWS4+CvL2DtVmFeFVM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8452/idp/profile/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/nya-44.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-44.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index e4dafaa7..00000000
--- a/swamid-2.0/nya-44.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-44.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-44.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-44.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-44.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2CquHOT0nXMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzE5WhcNMjIwMjE3
-MTIxMzE5WjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoCd3+9vAgk/wKkMt+6EwpJwqrKrAl99v
-97KfqrL8ixP3gCC/nQeyUyWUm1SJXJdnrE8CSn2sLJ0Kdo5zvcp6Kp/nYmn4eQaj
-rB+szq7qcuZtvCJIQ3RhFcH+1qTpWc4380Oa547XY/NofyDjJpJk2cI7dBaZjjVA
-euduG/ggDN9g4KrsR7gVp1p2GyfTpmHSOf4J0iRB7VzdSYSzJ07vZmhElbPdLfX/
-b4G/fA+ttWjnK99KAr5Sh3cJ8z1AJd73g6apeghfK3aqCZfTYrZPPbrTfG5gO6DK
-Xcar2svO7nd2j/2jgH4jcNz6sm/zyIHH5FPBDngjqmwfPRrDSU72JQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDQubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-NC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT5i3F4ePmS+GvYn9KcWwHN
-05FBYjANBgkqhkiG9w0BAQUFAAOCAQEATXYY9DoBUhcew39vCTu0n5/Py7GSMM3p
-Cn1FD4nMfzeaizdyc0T93Kd/QzhmYMsSick6ZYkqRfHH6gvGR5d78qcbfH/YnM0F
-d/KGgTLt0gDAKKZJzQejX4Xql6pyTEANwwDa01HSrICLpnJTQF6hpefheOM1LRfe
-efeVq/GdkjdLFCUbWOCYRfDpz1O9Js947gqB1BMHMKuDyVgLcxWXTbSdPp6IhGRw
-f9xV3QjPxdxwS7ldOlrrPgW53ggvndcmJyleQzZa7/p42fYMKbnQgRV3cCw4LQob
-gk/xy7OaTwrFd1Arkk6GcLXD60PP6qkSpUKy/YKDvRv52fqkxFw1AQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-44.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-44.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-44.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 679d54fa..00000000
--- a/swamid-2.0/nya-44.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-44.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALwfXjfk0+IzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIxWhcNMjIwMjE3MTIxMzIxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANT59hgfc21cCarnU5qExSXv70LJoK+r1sK9MATR42nh+G/MUq/n/BnErYy8jaT5YWT+oLF2r1soVhMtXq3N3AcCAwEAAaN/MH0wHQYDVR0OBBYEFHvSI4KjZoUUcW5dxn5sgTKZE+lUME4GA1UdIwRHMEWAFHvSI4KjZoUUcW5dxn5sgTKZE+lUoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkAvB9eN+TT4jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMjahxltSae7qIDxwqZENTQ6ln0U83hMaYWffgUffdU/MN9tECJ/kzBmW3XMWzEU6E9qk2pTAm3znFrdNjJ+vgs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-44.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-44.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALwfXjfk0+IzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIxWhcNMjIwMjE3MTIxMzIxWjAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANT59hgfc21cCarnU5qExSXv70LJoK+r1sK9MATR42nh+G/MUq/n/BnErYy8jaT5YWT+oLF2r1soVhMtXq3N3AcCAwEAAaN/MH0wHQYDVR0OBBYEFHvSI4KjZoUUcW5dxn5sgTKZE+lUME4GA1UdIwRHMEWAFHvSI4KjZoUUcW5dxn5sgTKZE+lUoSKkIDAeMRwwGgYDVQQDExNueWEtNDQubGFkb2sudW11LnNlggkAvB9eN+TT4jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMjahxltSae7qIDxwqZENTQ6ln0U83hMaYWffgUffdU/MN9tECJ/kzBmW3XMWzEU6E9qk2pTAm3znFrdNjJ+vgs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-44.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-45.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-45.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index fe19bf30..00000000
--- a/swamid-2.0/nya-45.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-45.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-45.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-45.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-45.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPCOJtfRECX1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI0WhcNMjIwMjE3
-MTIxMzI0WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoY+2rIyqwhFT1gjsiiARLRHKwy4J5wMP
-i99Tom+O/z3/5zstYTBNkY0DiWePIwPWSNbyj6UKle5wr1FQ5eHOrd3eMXB0bVLZ
-ovZeQgInaNq2Cw9XJjsK2IiJ2tVyj0ET+O6gKiuyXrWhlRTfThiYJ9FGAoBF+rgb
-ogvDcVHHCeK2dBgvvXXS716j7jgJWVesa6ziIj4GJnWSC7uZcpHFExpMhwUWw5Rp
-PCJBcsO7i3BFTaZ1ObzNa4742hzf1axC7+i5ag3mm3auH0ixVyEjleQXns1eYNRV
-cMlv6VcKw3B+Yj4P0ZN+qWX5uN6UIrIxK9A0Gm1cTfPnVcCQkJb6wQIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDUubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSFUnuZimfuqlwyI1si
-bq+Ojnz65jANBgkqhkiG9w0BAQUFAAOCAQEAoRpwCMIcnoGT9XoR/T/w6vlnKPoz
-mqd7Ea5sSCF00o4Zx8PX3l6XU5y06wvsQA1hBrLRd2zj36OiL5LXEnXxwLUL1eOb
-tMUBfnDsUB61o9MDUOTQz5m10x0LLsBCAQJ4cQZpROHlWqI6Fa0CL3Xxj6EqYzra
-Dd+13YCElkapvUtki/n5L/slZAMRg7aY97rLqlaSSoHt4HKACud0TMByvfPDjaJE
-lz04d87sl4mLiB0O9/OpmS/Qpmmw8altKwphGt0Abrh5Lnb3L1yD+7AOgvSvOPxl
-hLfWHWKd91WRCQK8H/VL+DOgKp0NaRyOp4/0SIR2xMmWuBJWNSJB7lO23Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-45.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-45.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-45.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index ffaf19ee..00000000
--- a/swamid-2.0/nya-45.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-45.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-45.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-45.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-45.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOEOFKFMti6mMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzIzWhcNMjIwMjE3
-MTIxMzIzWjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0usNdXvuOr+e2cX/pK1Oy+QBt7VtmqSL
-qQ5HvX0EokIwh+0QDxxcawsz1J8GMwdqzobBWyiH8mXLt0+i1zJETb1JUsY0lPZt
-55fZEkEjFySdlMtNHn/zl7p4pkpvwL5/zr8GzYddeyvtCSileAhoNPVm4TTa+BSw
-NB4HFX/NjNL2oyp7KuvsMXZfCAanhRsyRQ3FEgbB8WQ8qgxAn0GkxpRlSLFIgfbY
-5zrKz7sZpjCpMr+vzTU6xqXNJKH2RTEs+POYmKXUzTae986Jccv5njcBlcnGbbQw
-wlPOZlfUXvxCz90LLH2dhYum4zaz1Na9SAK9BqZPCwSRW2vudiEiywIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDUubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSJs4tkR9Wo836ZFHB4LaSZ
-j5pdMDANBgkqhkiG9w0BAQUFAAOCAQEAyBN/Kq63vBr/zYcKgyBQLrsWwyUshbGP
-NKxaMYCoSh+vjJkLmCpv6RceETApJu6gueQ+pAvoiqeKdJBKhN6mQXAtAbgV8Qvz
-3MPdym8x+Ym20zrQjVCOWZRibF7WPGqBzd0G3dgU7+31Ebvaa74M/HoJ2FebtLaQ
-6N8fQkVWMPWY3ceHQaqK0/tzTZdoJ81qg+YRQONJ7uM3/qM3Q/90iIKVqED02K37
-1Fb0I1nLS0KXKqqI+2TNojFUdU+ZCFCVJJksqTBBhHZ4aQ5a/PQQCoVjSXHEImCh
-lnsmoWPkGb3xFK4yyL58Jhv5tEJ0B4b/6whBdbLl8SW4rlCIaJQ0pg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-45.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-45.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-45.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 1a05758a..00000000
--- a/swamid-2.0/nya-45.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-45.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALg74gzz4671MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI2WhcNMjIwMjE3MTIxMzI2WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOZX90qy1v4kXDBsK37WmpBT5ItPB5qPc0I6+YkOTDZGQQPbT/ds9zD+FTOKBYlv4wt+iLpifZwEcl+fR3m+vpkCAwEAAaN/MH0wHQYDVR0OBBYEFMPABpWQI1Z3f6QPyPcmvJNDOAurME4GA1UdIwRHMEWAFMPABpWQI1Z3f6QPyPcmvJNDOAuroSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAuDviDPPjrvUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIEZ5DnqsO8aEkK0adgD533Brgn++YcNF87DqC3RmfF8Qp61eoMHoGzAr26YXs14e7iDZmYze16Fv1jJR68PJIo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-45.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALg74gzz4671MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI2WhcNMjIwMjE3MTIxMzI2WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAOZX90qy1v4kXDBsK37WmpBT5ItPB5qPc0I6+YkOTDZGQQPbT/ds9zD+FTOKBYlv4wt+iLpifZwEcl+fR3m+vpkCAwEAAaN/MH0wHQYDVR0OBBYEFMPABpWQI1Z3f6QPyPcmvJNDOAurME4GA1UdIwRHMEWAFMPABpWQI1Z3f6QPyPcmvJNDOAuroSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAuDviDPPjrvUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAIEZ5DnqsO8aEkK0adgD533Brgn++YcNF87DqC3RmfF8Qp61eoMHoGzAr26YXs14e7iDZmYze16Fv1jJR68PJIo=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index b74efc3a..00000000
--- a/swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-45.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL4Yd/EGr0TUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKrP/C2GSY7s2azjHGU8Ki1mVT/FIb3Ski/p0HuD6JdO0KxIJdZyRM4iqIrOhB2OOiaxtDWfAoW3CftFaNUSlVsCAwEAAaN/MH0wHQYDVR0OBBYEFLtHaoaR3d61fhqe1XRPw4uFbpm+ME4GA1UdIwRHMEWAFLtHaoaR3d61fhqe1XRPw4uFbpm+oSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAvhh38QavRNQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHXA8ERtCTcj12BvU5BO4ePfidSQ457HcpStHWRCIFV3PAdt4lpLjy9m6jdAqi6cjCsWVO/zv65Jlf9226ZAW6w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-45.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAL4Yd/EGr0TUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQxWhcNMjIwOTE4MTczODQxWjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKrP/C2GSY7s2azjHGU8Ki1mVT/FIb3Ski/p0HuD6JdO0KxIJdZyRM4iqIrOhB2OOiaxtDWfAoW3CftFaNUSlVsCAwEAAaN/MH0wHQYDVR0OBBYEFLtHaoaR3d61fhqe1XRPw4uFbpm+ME4GA1UdIwRHMEWAFLtHaoaR3d61fhqe1XRPw4uFbpm+oSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAvhh38QavRNQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHXA8ERtCTcj12BvU5BO4ePfidSQ457HcpStHWRCIFV3PAdt4lpLjy9m6jdAqi6cjCsWVO/zv65Jlf9226ZAW6w=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8452/idp/profile/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/nya-45.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-45.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 237e5a37..00000000
--- a/swamid-2.0/nya-45.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-45.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-45.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-45.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-45.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAK226Z3IqEFFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI1WhcNMjIwMjE3
-MTIxMzI1WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu/PWlfw5lmcUNgVyPN9dVHE08Xyh0mdY
-FWtsrJHn3/iWDmxtOG0v5rqR2NnhQtJ0351TyxBRS8t4BnTV+FAWwHNND9XPkLMu
-zbCuLw6qX9DjmnUzrwVFVaXsV7MkxThow9UTrArM2sgPt1F3Si8JegLWYsabuGkD
-huaAgH1Brz9AzeUS1CLgnh+BM6NfGZu/QS9+tO7yRzFD/YIJ90GlRqUHcmQUrQa+
-5PhllS2mxHEtvu1ehXbeGaNbUU50BCt3PQvbsniep7kIhlEMyFByDCp+6HNpQIcz
-msAcLJ7LehDn36lWBV0POlDNNt2cZuOkR8Hu9E8TZT4Agy+e9vXQ5QIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDUubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-NS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQiXv/QncX57hTz0+ZECNxd
-TKLmPjANBgkqhkiG9w0BAQUFAAOCAQEAeEXvQE6FqF6Hj8NgdoGZa22ptaQiZCQe
-zbatVgbosc6Qi0+HGtGOF4OT/JEvJ4Rw2Rzx9kzIlQteM+9RskPLr0Bz8M3PyGNG
-SmD8Cj86FrjfPM3QFLqtzS2tEs3L1hocgLvs/Red2HmMkUlrBhDSxf6d/jtwtg0A
-N5gHjRJZt4C2eDPTH5zqs+9gMi5MOGRqXP+yMIJDI0pTNXYnffYL3rwXHX2EgOpA
-Grxp3KVv2oUFE+xa7MU9hkRO9sT00gQkiyJaOBw31mUPPkncGA9fsUa/z4ODnpqn
-4VBr1tDzl2fg6a8/92hXiVr1akaossqdqe5tzR+6/MQDfCbTtM/gsQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-45.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-45.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-45.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 75973fe7..00000000
--- a/swamid-2.0/nya-45.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-45.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMk57tr9xfmGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI3WhcNMjIwMjE3MTIxMzI3WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjOyqjobvbTrvnfIt5+I55vP8CcXN4ejrR928DTqJ+IqKvklBQfA8siM/RUpADYgr3TmZpO9nCZwvcoeyFoQF8CAwEAAaN/MH0wHQYDVR0OBBYEFO5ddZJxjdhW3ET4gx0pz5NWCiLnME4GA1UdIwRHMEWAFO5ddZJxjdhW3ET4gx0pz5NWCiLnoSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAyTnu2v3F+YYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEYavcn0byvRiY+jqvb1Dz+rnZxTFuu5FZKOwfYQ8o81DnG+KzAOXgyR/sPn/YYEd7MLZrWDVqrZ0GnlvJyC12Y=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-45.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-45.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAMk57tr9xfmGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00NS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI3WhcNMjIwMjE3MTIxMzI3WjAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANjOyqjobvbTrvnfIt5+I55vP8CcXN4ejrR928DTqJ+IqKvklBQfA8siM/RUpADYgr3TmZpO9nCZwvcoeyFoQF8CAwEAAaN/MH0wHQYDVR0OBBYEFO5ddZJxjdhW3ET4gx0pz5NWCiLnME4GA1UdIwRHMEWAFO5ddZJxjdhW3ET4gx0pz5NWCiLnoSKkIDAeMRwwGgYDVQQDExNueWEtNDUubGFkb2sudW11LnNlggkAyTnu2v3F+YYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEYavcn0byvRiY+jqvb1Dz+rnZxTFuu5FZKOwfYQ8o81DnG+KzAOXgyR/sPn/YYEd7MLZrWDVqrZ0GnlvJyC12Y=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-45.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-46.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-46.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 7aa49000..00000000
--- a/swamid-2.0/nya-46.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-46.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-46.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-46.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-46.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPU7nWJ1NeJyMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMwWhcNMjIwMjE3
-MTIxMzMwWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA45/+cWUpCc7M4MXvjcFSF4Re5rT729Bz
-Yovyyz75bO2UZENdYscbtPfAEHyIBD2HUE4NwGOy4IS7UsiqvjHheMsAwqJDJb7Z
-zQskT5KcvkCt1VRdFAcik3qrNEj8rxfIdUpR5gYAQo3N05Vfpi5kqBi8aBGe+kJ1
-ZPuKDtpOXkYG4uQdsdeFs9LpM8knsnwnA9PYb9uPUPSvW1ljUsaT7X+AcWLSJ45A
-O5t6rVD+I7/QclgymI/SqJV9VsnmWikN2hXOnI/URVqpenK+B/PupbjXXudjElmz
-9biH2astqKDrCAiT/l8k8Bc3tgf58XFMQbbVvBxp6svsaBeCBBkvNwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDYubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSqx8j6/pN2A7Goi/TE
-kBdM8PcVmjANBgkqhkiG9w0BAQUFAAOCAQEAkkrLDNy9abNxi18EqQeOi4nCjZ9k
-DQ9sBVzGjYZj7D3Vh6o32wD8NGgpyWRLiCO2wLRRFno1d0pNBVqF4eoXCJRT8Li9
-5KyH1R7XppN7mzWfwgS462RQjDSWZpzzodSPzGyg+yT4vu53RxswL+IzykupeOco
-Mt8kbglrJ7ghPUVQUDyCrz+FxOR8NYRASNHtXXjNaSbdNVmax9rHCJ+Yu+K2q3BX
-v8UaZ9Dp5IXg/og1Fosd+aZelwoHO3qbYGZl+aU9HHls5xBVnzj6sJ9VETUEzSZ9
-+QJNOeTwm2HoZXN/0LdDTLMb7h0WGn+/iRhXwLxs/+0jUYnzTeDQ2HiHTw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-46.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-46.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-46.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index ff720d21..00000000
--- a/swamid-2.0/nya-46.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-46.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-46.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-46.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-46.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIw6OVPU8U/AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzI5WhcNMjIwMjE3
-MTIxMzI5WjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDgm+TEdxNeAQpxPILznsRVPthmmzo6A
-yI5+McpoZDxEir0BY0g2LNVP7YNPGpj7Gu0sah0VH5aNLb/iCyrg+q50iBhoebl0
-ryaLN1vviJP1d0gBemLSg4zhCzIBVfaaM9SMJQKTG29aT4ONT2rayL34eIocClcw
-sAIDz9H1jKDeZ5uFDbRFC7aIb1FiBrZkddCfj9lEA70G/TxgLZbrUKWAWI8ntsut
-3wciftJ7YUt7WnzlcyYr6GtiIsisOXk7trKtOBywbJeUNmbkDXTVsxpA8kWqPah/
-PZUrKFqgBhsQh73BXK1xSZtXzvb61ZyCQSoEk9sg9510MSZ7cxwrewIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDYubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSJ3zgXwb6P+luTkK0P7Etm
-Lq7vfjANBgkqhkiG9w0BAQUFAAOCAQEAVtrj1RV2Ly13FVZeQGBtO2/cUKXldN0x
-mIfIzONoVzr9iWdQFtfRK4DG0OKihswB3ThqpMc6NaDBAGU5XPr2VGeDnVgs86pe
-bsYT/mmefVJiXLirkKE1BvdJP5nieS5Z/H9dG5iqA3fvBrFY1XJ0f0XHsjoI5BO5
-fb10jyKgF0YCIYsF5nmOW/ePO25bZJuw3BKXF2fnI38CGTEJyCSi/bxH+rUbdlkz
-yGyDih64vY31UtR5Fg5CltgXw10p5hvMBZIwgVsbSk+WhgJUCTre8sfxKLHrPj5U
-pfhKki7x3ATaNm86Fq5K61gZLxXksKUmnY045ltykQd0QfGu3etpKA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-46.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-46.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-46.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 6c8361ab..00000000
--- a/swamid-2.0/nya-46.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-46.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL0OziKlzh3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMyWhcNMjIwMjE3MTIxMzMyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALStdDog2qahXDvyBsuNTXoh+Q/85I3+5kp4EvuwFDGM6SQR4oKUr1dCntcWYlOjJ8yRK6didzbDDS2xfy1ypdsCAwEAAaN/MH0wHQYDVR0OBBYEFC34djHaK05zUr/Nczplupjjg4fPME4GA1UdIwRHMEWAFC34djHaK05zUr/Nczplupjjg4fPoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAvQ7OIqXOHeMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJnX2GL+1ojc/z1Mqdx48F/u6GucM8VcxDG3HRZJsSf76JEqkQzr20r2nhruHrqKvHwbKmJNa2I5xgLW1vYe6Zs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-46.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAL0OziKlzh3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMyWhcNMjIwMjE3MTIxMzMyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALStdDog2qahXDvyBsuNTXoh+Q/85I3+5kp4EvuwFDGM6SQR4oKUr1dCntcWYlOjJ8yRK6didzbDDS2xfy1ypdsCAwEAAaN/MH0wHQYDVR0OBBYEFC34djHaK05zUr/Nczplupjjg4fPME4GA1UdIwRHMEWAFC34djHaK05zUr/Nczplupjjg4fPoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAvQ7OIqXOHeMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJnX2GL+1ojc/z1Mqdx48F/u6GucM8VcxDG3HRZJsSf76JEqkQzr20r2nhruHrqKvHwbKmJNa2I5xgLW1vYe6Zs=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index a9b45f36..00000000
--- a/swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-46.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIXUG6HnN+HLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMutpFTCHHKHcvqMuGEkn1tx4SKGBf7lf33s8xC2gUqjZSIm2H/pwyImMsD6qq0doEwn9sX5TumRRxdAI81dSTECAwEAAaN/MH0wHQYDVR0OBBYEFD8JekhbqpJnFcmEAaEbU5HMaTgoME4GA1UdIwRHMEWAFD8JekhbqpJnFcmEAaEbU5HMaTgooSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAhdQboec34cswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGfh3JizTtmHddHTO0joa/Z4NghihMXs2U9T8aE0D7qneG3RGxMPFlhM/7OlHVbgFv82zSQUgGW9uxs/n9Z6ra4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-46.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAIXUG6HnN+HLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMutpFTCHHKHcvqMuGEkn1tx4SKGBf7lf33s8xC2gUqjZSIm2H/pwyImMsD6qq0doEwn9sX5TumRRxdAI81dSTECAwEAAaN/MH0wHQYDVR0OBBYEFD8JekhbqpJnFcmEAaEbU5HMaTgoME4GA1UdIwRHMEWAFD8JekhbqpJnFcmEAaEbU5HMaTgooSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAhdQboec34cswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGfh3JizTtmHddHTO0joa/Z4NghihMXs2U9T8aE0D7qneG3RGxMPFlhM/7OlHVbgFv82zSQUgGW9uxs/n9Z6ra4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8452/idp/profile/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/nya-46.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-46.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index f8db382a..00000000
--- a/swamid-2.0/nya-46.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-46.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-46.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-46.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-46.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAI+ekpDl2R4qMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMxWhcNMjIwMjE3
-MTIxMzMxWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAojIqqEgyjq3R+WLLKVELsR78EpPiE7T2
-d61yK86781VpWa57eJQhpcncYW5svCuCprgVNEgVSuvCd5Y71gR/F4J7J3ldm/kG
-lpYqftTLy+ZAltTsuR8MaLS7/zgqUx0icpf3cABDABlrn4hgCjnHMYRKAq7H2b16
-U7TzAQ4gPn6N2/+oFQFE8e4uq/YDPyG1NHxFnVUreEnM4DGK4C4Xd+MVr5Jvow/J
-+pWEYlqAG+5rmmw2MWp4GdoGXOSPsfcue2ckqZ2pmm3agXzL6/umDuAKsKObId7U
-58SHFW4AMoiazN1xbqFPlFtSfMBfzHJyEoBWJYYqes2rGb7GUvn6EwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDYubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBT88evnF+7qGf56PidClhox
-jFI0VTANBgkqhkiG9w0BAQUFAAOCAQEALZf1xuErtAgcppJ4/nJyFs2vFDKzTDKg
-3xdvQPGzSlmohyKcEKQgVUm7m7ez8raX9Lptri1zHi8pjFoG2k6vxAp9oeppnXJp
-QiQtshBoHJLY2yigQD8yUXJiN0mW0DQ3IXu6iPh6USEQwlysBQiM4xWEwF0u7Ao/
-bOoKJ9IIU0F0+c2i1qABLSTiKR6So1wktAXPQzz0qwXgHqtxpaoxseu1vGcRnFTV
-MFo1U5bkNceX2B20YKvo2nnL2sVx6jcnIIacQM42M8pfRMxk8L1qTd+DilrMO0ah
-e6mLkRjJrQyNp3oDfgGtEOZCT0glnLE/UEDSdyR8BxCq7cqJcPn/DQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-46.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-46.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-46.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 5d231eb2..00000000
--- a/swamid-2.0/nya-46.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-46.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJBu02qdDvxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMzWhcNMjIwMjE3MTIxMzMzWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALU06fqLxdKS8fX/VZRDWV70M3rl4bI/tE/M77/QtGOctX4jhv0RbO+S7MDPIk43iRvIim4e3fmWs/wilp7QjnsCAwEAAaN/MH0wHQYDVR0OBBYEFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHME4GA1UdIwRHMEWAFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAkG7Tap0O/GUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpjV+IB5yGSWwvBS/k0Scix4HYA/dPph9Nss7aGuRZuEffJFOqSaKl/utboBnO6rN2tPatPFvffoFe7G4kFZsg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-46.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-46.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAJBu02qdDvxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ni5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzMzWhcNMjIwMjE3MTIxMzMzWjAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALU06fqLxdKS8fX/VZRDWV70M3rl4bI/tE/M77/QtGOctX4jhv0RbO+S7MDPIk43iRvIim4e3fmWs/wilp7QjnsCAwEAAaN/MH0wHQYDVR0OBBYEFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHME4GA1UdIwRHMEWAFPe5pIHXPWoyS+7Gwm5Z1I1F4DVHoSKkIDAeMRwwGgYDVQQDExNueWEtNDYubGFkb2sudW11LnNlggkAkG7Tap0O/GUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADpjV+IB5yGSWwvBS/k0Scix4HYA/dPph9Nss7aGuRZuEffJFOqSaKl/utboBnO6rN2tPatPFvffoFe7G4kFZsg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-46.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-47.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-47.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 07399a72..00000000
--- a/swamid-2.0/nya-47.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-47.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-47.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-47.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-47.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAIKGJs6KE1EbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzM4WhcNMjIwMjE3
-MTIxMzM4WjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmDUCakgjPKnrwt1wANDLeSm85uxOuuaq
-bZ2oIQ3MrMBjDSEuLOGf8ssJYl+R47XkN8lrOuY7XVzhhOrn5rv4V4QT/pDeq+wT
-5QMlN+7qekpk9x0j42S7YmnWxkcvgbTgspl/wewD04HXBHgyfLiS/xBA8KHPx2e5
-/05+vOZcl3U4zmGmGeilzBJM4GJx8h2LvkRFZGMxxj+eLjilrwobIxaylTWxdTNv
-W93z4UFohWKPD1F7SQVeVZLy+p82oxat5AoY71r6F3gjSc0w9/fVOBuh6aK5IFna
-xP6FWt7dzg2Sy0+41Wl+gHVeP0CpBSVqTL69XOA3C8NFjXJgXnijjwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDcubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTX2lhspR2CE6z85M5P
-KHcR06RjejANBgkqhkiG9w0BAQUFAAOCAQEAErzTTOyVJHlDIHSgwucYrfLetRIw
-ZWstNkCK3b6Wtyg02WfHT4X5RmvNGdEAJF3JsIb1G0NQ8Iabt8ha9FEMHiYbJwDm
-7rQ9e4/QR2p+h9qympDnf5f/F4XB09uvE2PEXwjKUgGAilZUHXYUR/EwPiEb9yvt
-D22Pi7lLVJ4RwNzW5XfQ4toOabIl0Da2PEz+8+4HRKN58NAJ6rYWYe2tWUUev8iQ
-VTDLZMt5xXcZ53wPenW0YGYvGIGP5wkCghRVzvanS8s0radMbd9tBi0QdBc+Q8TA
-I2/OAhnrp/0L0n3N/m7ywJxCBKFwpq8GJHfapLKEavPl/nf1bh29PRuxTg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-47.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-47.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-47.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 97d417cd..00000000
--- a/swamid-2.0/nya-47.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-47.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-47.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-47.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-47.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKcEInslZcO1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzM3WhcNMjIwMjE3
-MTIxMzM3WjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsAqG0LEHMuN2vDriZ9lLf8seOXlfkIZe
-WEMWvSmlFW2X9xYxIv9ra5x5YkOuD+O34Fzhe/Z8CipLVDi/rELYvbL/CXhn8Omf
-rw4VovjQ6c/UukFp+ALwfkrxusvrJiPQPC61TSK22UnnmzX8wmsD+l/I01j2CD7L
-4zNyPwzunyzSGkdtm7j64tQ09kW1ElSySxbYgpV/5tk2NDdoOe75sCWl/Dd9nLNv
-hLtKrNJ+QV453rAtxUW8BKohm58eb5+CDdINMZcNr7svcRZUiETY/BsWCyQAlB2f
-nERoiAfLeGufMg94BEbtDjBZpUQtwHqenN5BKvAIs81eWVUMM/lKbwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDcubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTC2zaQrpwHNrb6nPFbj/tv
-6MJyFDANBgkqhkiG9w0BAQUFAAOCAQEAKIB79z74TEvvXboCzQrs7orbgriIqvbJ
-d/uN/DafPVIlB/WVloS2zwVz43FrwiRT5GidrF6uVLx6BBKv6STJhzPoZxW47TmE
-40rUwLAUMbZowmy/bzhrPbM9GpMlBELFbgaMZK3RbWcqgij/yIvnJh8MsA1BMaAy
-Gg+ZBpFKPjb0jYXrrNdpSfVRziSL++qCK0dh0Hv4P8e6UyhNw1zzg4KH6f8ma0jI
-tllspDpmqg61xQdS8Mb2phZzhDzYqJFitNOPnHmA3R72qskjOIq4VazEOtAddb+5
-c9CXZ8Aa7kzLHFfet0Cn308DR7TW7whq7j/Em1ehhCrHAu0kcfOfjA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-47.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-47.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-47.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index ef0d559f..00000000
--- a/swamid-2.0/nya-47.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-47.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOMAoTWEE9PgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQkuSp05wjdn/dC51u1PLrcamD/nfPJ2TRecl9odZt9Ii7FPF5FNmldU36/O0zS3TC10D3k3yfoeZj/dBXpd8kCAwEAAaN/MH0wHQYDVR0OBBYEFHTbawbG7xoVTPiiFy2YI2ry265LME4GA1UdIwRHMEWAFHTbawbG7xoVTPiiFy2YI2ry265LoSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA4wChNYQT0+AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGP1ucEREVCDmgcnTymWVYdYBJ2ET1t9hpcoobjF9cW/ALUjvd4fsUdETuW9XYmTmOQcn1HWTx5KPy6WFgfpN/s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-47.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAOMAoTWEE9PgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKQkuSp05wjdn/dC51u1PLrcamD/nfPJ2TRecl9odZt9Ii7FPF5FNmldU36/O0zS3TC10D3k3yfoeZj/dBXpd8kCAwEAAaN/MH0wHQYDVR0OBBYEFHTbawbG7xoVTPiiFy2YI2ry265LME4GA1UdIwRHMEWAFHTbawbG7xoVTPiiFy2YI2ry265LoSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA4wChNYQT0+AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGP1ucEREVCDmgcnTymWVYdYBJ2ET1t9hpcoobjF9cW/ALUjvd4fsUdETuW9XYmTmOQcn1HWTx5KPy6WFgfpN/s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index f01eb53c..00000000
--- a/swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-47.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAKept7+35fccMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMtwKQtgKkcYquUihzXIxQvlkdEj4u3OZuIdHpIf9CX3RaroJppz5wvuhFAI01EAhS3fnQCN7TUn3wR0QfzNa90CAwEAAaN/MH0wHQYDVR0OBBYEFNAEfnGAtql74mFfW5Vthnt/ST3wME4GA1UdIwRHMEWAFNAEfnGAtql74mFfW5Vthnt/ST3woSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkAp6m3v7fl9xwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/KBGdR8PfjAE7G6m05v5MnG5HK+tyF8BRvXT1LW3gw7NiZrqou684LHg4W2ySdFZ2fmCa+yxFv+4wk7TvJKY4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-47.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAKept7+35fccMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMtwKQtgKkcYquUihzXIxQvlkdEj4u3OZuIdHpIf9CX3RaroJppz5wvuhFAI01EAhS3fnQCN7TUn3wR0QfzNa90CAwEAAaN/MH0wHQYDVR0OBBYEFNAEfnGAtql74mFfW5Vthnt/ST3wME4GA1UdIwRHMEWAFNAEfnGAtql74mFfW5Vthnt/ST3woSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkAp6m3v7fl9xwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAE/KBGdR8PfjAE7G6m05v5MnG5HK+tyF8BRvXT1LW3gw7NiZrqou684LHg4W2ySdFZ2fmCa+yxFv+4wk7TvJKY4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8452/idp/profile/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/nya-47.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-47.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 4751d04b..00000000
--- a/swamid-2.0/nya-47.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-47.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-47.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-47.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-47.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKn4WsixpLnkMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQwWhcNMjIwMjE3
-MTIxMzQwWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAviceY07ek+oWzykreeIfx5mfxEZPUMR8
-4lhi8C7UzTlRYXZ7BWVCNFeTKirNWpp0oFSfgjrDFgD1a8Fh2tYjuEz7GGq6pcQx
-wm16gDI42EU9NlJIEak05HkDp+D7yx7ZrTE+c8qyftzGLY4dwAKpvVvHJSt+ebNN
-P4+T1tkqpkzPefEVUSi1edZmiOSxEIQ4rEzkBf7s/uPKQ6NDbTM8DR5LARe5Bfem
-YEPOLFjkruhutjUISNZI4vpxAYIN/k/gcFsMAj/DC9A2O+eXZXETYIdcneqt7seq
-Kkhud0CgYWeT1cJVhut99IAcrCdzgquXlcwnht9m6rbGu+B8V77fMQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDcubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSXos6kOaP+K78hw9O2Nycn
-Z9G1NTANBgkqhkiG9w0BAQUFAAOCAQEAVvD1feEFIjLi6rx3IAP5H7X3uS0inHNM
-Ss8sbMyoEwP6SCbc1bLhowuUeetfYOtfDbV5hd5Perfmj5xfuUG9ErX9cNY5vsbO
-PWfoSRPHgxD1Mq2io9I+iUKP0ebAqPYCbkpnstw9SV33j0Z3mffAdKnGNHjZZawE
-sBOUcdhX6MhG1ee3FmRjEuwC6ISvrd97j0L3IHBXULbMpgRbYTiAUzW+KjyRuklc
-UyrPWWG/No1JuKCk1IGrKV1UVSbtwld5QIQpm62vbkusz17W9GnV686fyFY5dbsN
-W1uPnkV9H3icc1ogBJM9aqATomWj6mkqORkYqtkEBY2KlHcFxL9NrA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-47.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-47.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-47.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 87bb4da7..00000000
--- a/swamid-2.0/nya-47.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-47.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANZMnm5U5tYcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3tXZYX2F0j1jZaFwp4zpAJEGzQlNpn2mWzCUqZf93/1Y94rWkOGpniljNRq4mmfRtXxVqoSLW22LDd9fGaodMCAwEAAaN/MH0wHQYDVR0OBBYEFCuNtxi/KQBDYl6NX9HuZhM6dNV2ME4GA1UdIwRHMEWAFCuNtxi/KQBDYl6NX9HuZhM6dNV2oSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA1kyeblTm1hwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHHv7ApXM2vi4yOpFMe7mdpM4jE9w5BdDL7OYfYVj2ox6QtsA6m0guGWY//yqpLJmVKstuxEpycioX7P011AiLU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-47.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-47.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJANZMnm5U5tYcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00Ny5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQxWhcNMjIwMjE3MTIxMzQxWjAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM3tXZYX2F0j1jZaFwp4zpAJEGzQlNpn2mWzCUqZf93/1Y94rWkOGpniljNRq4mmfRtXxVqoSLW22LDd9fGaodMCAwEAAaN/MH0wHQYDVR0OBBYEFCuNtxi/KQBDYl6NX9HuZhM6dNV2ME4GA1UdIwRHMEWAFCuNtxi/KQBDYl6NX9HuZhM6dNV2oSKkIDAeMRwwGgYDVQQDExNueWEtNDcubGFkb2sudW11LnNlggkA1kyeblTm1hwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHHv7ApXM2vi4yOpFMe7mdpM4jE9w5BdDL7OYfYVj2ox6QtsA6m0guGWY//yqpLJmVKstuxEpycioX7P011AiLU=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-47.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index e5662104..00000000
--- a/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-48.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-48.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKqMDl9k8exfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ3WhcNMjIwMjE3
-MTIxMzQ3WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3sEZxNqp5b8LIKWuxz4Tm8gc4WSvh8va
-d+uY27pWwZThUYPPVcghjx1PknTiu0Guk/hx0R6au49ISk2OPkn50zQZz3ZTEmfq
-QYuqsRFWqEIhPQh5pMp41pW5l93p3iQ4UxDd3MVYYut3+XOrM5V+E4ITE32hWSj7
-zGNlEAwY3/z4perUrHrlBURtPe2VPtJRgrWHUU1zZTyZj9JXKFTovYnoND30IW+l
-ypgHYd2nIEkg0ipnggBT5eAbWCfRHh6Hn0x6HwKjxvciGmRP/yQ0+A1iB+p7gKjo
-Ht+Rh+4Nim2Q3bS8M6sr7R6El0MA5PCYvzQIZGODa0qRcfw9g1gs1QIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDgubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSJ0nbp3OFnKGbwbldL
-n2a+JedT8TANBgkqhkiG9w0BAQUFAAOCAQEANwWlJk9kNjgdiglNoI3+peHPpqJi
-EfOVP10VNSFJYWxww3G1YIUmABDF5z1/4z3OSbBi/sTbPM5LkrXITpZO1OoGRAPR
-7MufE3ZtwBkMKUuK2kT8RiBIHvHFFVl7DEJYGJIz+EG6XetkRRvQq8IuduTsro3+
-7ropOdBs0K7X9GV9IhCjCOyJeawAlRn0NB1L4bmKDfbJhxDLcGV6LxRrsVy7mcfl
-bp4cVLZwNNktOTYIP7rHzxthFF8fpi0846X/j/HkFRAfdv51Tz74KwJoZ8a3dC4n
-Ld+xpeD/skZA/APgHC4KyHTCFax4Bef7uRlKqxjhtnbjJgnBaduKEc4OgA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-48.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-48.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index bb8349b0..00000000
--- a/swamid-2.0/nya-48.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-48.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-48.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAN/Lh6K7hwMNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ2WhcNMjIwMjE3
-MTIxMzQ2WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAteYSycwkSxAIjjRtMIR+Momc2ZIg+7BF
-H/82vr1mq9Tkp/tq1uRJCtKBNmfDsKUK9SkeqXh2XPfukS68dU/DQRhxE+i1+jWr
-JBJolfiaeFp79VB+gTQRhaERzDaLiWSRX+oEht2pH8ktPTX/F7lk9Fdd3yMPonFw
-qOpK0ipbUOQkQvPQXitQ3Wz2ree0e/TrBbUtxIjDLpZ2i5NLXSK/myZYA0nVJ/+U
-UcdsjT4W9XjVmx/5HS9wFddgcCGARW8iuD9VDZ0I3j1ssVVgJWBs34KNKlen6eKK
-YhuEpvkURIgyLadoi1Sk0sLKHhCOtG2AflRlfOCtbtu69ajLE4wqbQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDgubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBStNj8fimlpM/uHtpx1mkYI
-gy+fVzANBgkqhkiG9w0BAQUFAAOCAQEAhLeyPev+WL+bWVvxTDEvJJw9stQ13VEb
-4DXa/YY1s5SPNsT/sR+ICQ2S+cKdeUCMs77vj/TbzEjNL8vFgm9mwQVkM5+d2XWB
-HVQ+V4mr0KFSeMhSrPzP0/IzJJZ1UG8qb7D5LG4fQ+4+hyxwb0MtczIpci/tJlVZ
-u+bG+fWj7PvIJLJcIETQOyKNkrdvD//1Q4csRFJPcW5Jlm8iP/NlElwkeANWK7Rn
-kWqPs+n25jgxp6Rbs63uGOob5czQrPhJ/ZH5T7pdJ8TDTZZwAiYMJ8uqMfsygtJO
-7qxLeO+0/qpdpZq8nHlK5CMdSdkDu/g8GAR+Vh8WUXkmECV5HhFpDw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-48.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-48.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index de8bb02d..00000000
--- a/swamid-2.0/nya-48.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-48.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM/aZohEdcZdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUKO60cP/Nl0D4G6NRxZ9eAYbB9pXap2WPkRbQ1lw2OA2Z3ZY6939qlKG/1US1yuW1dfoznjUR2Fi0SMLi5DNkCAwEAAaN/MH0wHQYDVR0OBBYEFA2RbWgGfzaFcWNUF+cURUUXtGTYME4GA1UdIwRHMEWAFA2RbWgGfzaFcWNUF+cURUUXtGTYoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAz9pmiER1xl0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEDJxwunhPwJtj1fGMENqlN40hPSxz82BaQwJTjcnRn0O5LqLX/LN4sO2IVtcNVf3TZFt+fP1wB7ZftmxyXL2Xg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-48.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM/aZohEdcZdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUKO60cP/Nl0D4G6NRxZ9eAYbB9pXap2WPkRbQ1lw2OA2Z3ZY6939qlKG/1US1yuW1dfoznjUR2Fi0SMLi5DNkCAwEAAaN/MH0wHQYDVR0OBBYEFA2RbWgGfzaFcWNUF+cURUUXtGTYME4GA1UdIwRHMEWAFA2RbWgGfzaFcWNUF+cURUUXtGTYoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAz9pmiER1xl0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEDJxwunhPwJtj1fGMENqlN40hPSxz82BaQwJTjcnRn0O5LqLX/LN4sO2IVtcNVf3TZFt+fP1wB7ZftmxyXL2Xg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 44f92390..00000000
--- a/swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-48.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAK4CesQMej4iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKN0yh4oYAeUlrS9CBN4dTmD+EQtgmLM/lk+++mmE8W1lwLBcCJP+89PclOvkr9clfAXInYhFj8oshiJoPOahIsCAwEAAaN/MH0wHQYDVR0OBBYEFNneqaFS8mk6PBKYpUuPiLsQVdf8ME4GA1UdIwRHMEWAFNneqaFS8mk6PBKYpUuPiLsQVdf8oSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkArgJ6xAx6PiIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKJcnNK3yPpC6IbJTBuxYNn70Gj5bx9OuADFVI7nJ2Cl+i9yq1Ork6PiVsJeU3UEQYePxJm1RIee8um7aKC7ZcQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-48.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJAK4CesQMej4iMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKN0yh4oYAeUlrS9CBN4dTmD+EQtgmLM/lk+++mmE8W1lwLBcCJP+89PclOvkr9clfAXInYhFj8oshiJoPOahIsCAwEAAaN/MH0wHQYDVR0OBBYEFNneqaFS8mk6PBKYpUuPiLsQVdf8ME4GA1UdIwRHMEWAFNneqaFS8mk6PBKYpUuPiLsQVdf8oSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkArgJ6xAx6PiIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKJcnNK3yPpC6IbJTBuxYNn70Gj5bx9OuADFVI7nJ2Cl+i9yq1Ork6PiVsJeU3UEQYePxJm1RIee8um7aKC7ZcQ=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8452/idp/profile/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/nya-48.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-48.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 82f13363..00000000
--- a/swamid-2.0/nya-48.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-48.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-48.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAOWzeN1n4fSfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ4WhcNMjIwMjE3
-MTIxMzQ4WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt46bHIrH1UxDGmUkPQ8zk0AjwOykg5qz
-Sgs6RDthEQaEMV4U4FnA1IgQrWkP4b5ypn52ljuVPpSfHy90z09NbmiO/19S+d1a
-5WDyvaV/DmAQOla/dQ/AwJ01p81fjWP8fGTlfG1i56wE/w1QK/KU3UQVeP0YjFXB
-T6Qjy3W/TO8QAL5n64H+rY5l0JKmA4N43tPDPpYNB8QELNZdeF3fCmCiRvd7ZEr6
-6L+Df7LI+C9v804vcrhnj4GyyHOMYCNSEHPJHA0D4hrHZVpxw9VCHYRc2TyzaIBm
-A6EWum8BkEiy7VcowPKjpN8BFGZGvdw3MDzUbEH9h57tb8XZgipxcwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDgubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBR9Em1nezTSUcY018x3Sz6C
-O/w3FDANBgkqhkiG9w0BAQUFAAOCAQEAqFDlFFRoqt2HVOQBdinvju0nFi9ef10b
-TVfEjvMODTH3pFICcDODmRCxN+I2TOSKaiy4GoPWm2BN83PPRoPGDbfjhqVWrd2K
-Plp5BT75lSeux2v0GnJNqnclaACrZIgrF42Z+iiKYNiTeO8zy0RsNFFndnipWMpI
-U0x5DyU7WjHvfCWolOl9Vrc6m742lB4JVolf6g20bsRjsTjukZvpvo7l1/yj92l5
-TJNC9duOEgnZzzEzcAOZ67gLMf6QeisY3eMpWtbh5DOekKSXBv9Xmk2pWTViTKZH
-xpwu1BXpAzhSvrSWzn05rfqCc1IGOT4sTSv99GRgYU0464GidHpmUg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-48.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-48.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 9ff9a772..00000000
--- a/swamid-2.0/nya-48.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-48.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALbMbSXqkcrGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK3dJ30wOwhJ1GrhYbDeZwESo2rIVte3K7jSi5tyB6kpFJA4zHdMGfEpucd6+4/TuYOsQ24c0W2Kmib+jGrUWJsCAwEAAaN/MH0wHQYDVR0OBBYEFPRKzkvPOA1k6P1RhcrJ6Tsw+42OME4GA1UdIwRHMEWAFPRKzkvPOA1k6P1RhcrJ6Tsw+42OoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAtsxtJeqRysYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKvzcNMrWaVM15OdUNh48BxlHg7amcRTbL7MPPV79bhwH5bw/U1ax+Zm0Tm64cfOe4trQ5o6WeIarBgr1DHp7pA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-48.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALbMbSXqkcrGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ5WhcNMjIwMjE3MTIxMzQ5WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK3dJ30wOwhJ1GrhYbDeZwESo2rIVte3K7jSi5tyB6kpFJA4zHdMGfEpucd6+4/TuYOsQ24c0W2Kmib+jGrUWJsCAwEAAaN/MH0wHQYDVR0OBBYEFPRKzkvPOA1k6P1RhcrJ6Tsw+42OME4GA1UdIwRHMEWAFPRKzkvPOA1k6P1RhcrJ6Tsw+42OoSKkIDAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlggkAtsxtJeqRysYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKvzcNMrWaVM15OdUNh48BxlHg7amcRTbL7MPPV79bhwH5bw/U1ax+Zm0Tm64cfOe4trQ5o6WeIarBgr1DHp7pA=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-49.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-49.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index a23a8ca9..00000000
--- a/swamid-2.0/nya-49.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-49.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-49.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-49.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-49.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAIn8foGZevGhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU0WhcNMjIwMjE3
-MTIxMzU0WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1+GvxxOS8snlA1fT2NwYdStVrlEwngc
-5uDhGZMV5qJR90RqSGOYNYLzZ5AtbBOyZRrw9+POK0gzgLmDlW0n2XHY6i6VQsla
-TfKWbceQ5AAz2OjJdyc0FKAoAILJU38p4STiBwnDalWEIL4nA8LHr3Ur8SshG0HT
-BZcmM55rff6efr5QWJ6nPANgtovSsdoMPbYRf9VrVAlbL4StKSeRtZNE+lp7FPKn
-yIgUIrMFM4m9+m/7NKT15p2HZeXTNBxmum7ssvS0NlCzYCC9u60yp/lEd8UoHCmQ
-Imo1Mw8w4pSY/bGBp4zfJ73P1dRsk42pWUJxVvsj/M4NJdJU+j0qJwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNDkubGFkb2sudW11LnNlhiVodHRwczovL255YS00
-OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRWfhcdcSIfzlbAhs8F
-5FxkSDlPNDANBgkqhkiG9w0BAQUFAAOCAQEALx+78LX6iqrNgpGjGg0a8I2b/LSR
-9FDznxi+lBVIVi8RPI4ySvl8x174mZaKsZaoskvJzP3USdETdNcxqMLtfqKWYWUV
-62my6C9wdHwyWcrw0Sqt+BOZ4J0JySLPlNcIHBojCjOzfrKFMx/WzMWtbS2fGzdc
-7Izcx/8KaRsQEOpwSeEzIcFtOVnBPOAyN2WxkevHCFgPwDDk+yEGDNVDUKdHOP0q
-YyM8TSkj8h73QkX6pz3RrNoDnrJ5rl7pDwhanS2koU5f65H/VxeGAXuuJrWkRjUb
-fwKWX/V4dW005rkbR3nkIWPvWsYSDuFTVfe2jOmiKU8UkiW1ZyPllyxg6g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-49.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-49.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-49.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4b67f8c8..00000000
--- a/swamid-2.0/nya-49.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-49.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-49.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-49.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-49.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL5gHI37k05eMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzUzWhcNMjIwMjE3
-MTIxMzUzWjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuVQVtvK/K73QPAtTymbOrxRkeBvAh0Cm
-cPQeLhPhW2/VH2aOEXUzwTEsi86VGSIE3n0tpwPaCmp2xZt49mxz8zkq0mQDxohW
-mlzFCq41wI7tpz5xglerV+tyJwERNDH2Iz2awSA5aZfm8GNoKZu0ssfTRiepH1b0
-kGPR4cwshFytYr3AA0EOhL7mAUEmsklzsJmTGc5B2l5nH66RitcsPo+soSThm+oO
-YSgTgdc/Cz1VnB5Z8bTxtlt9+aUamRm+CAE9ZCDMVOLvjIcAKlcs5yFUioVhQdWY
-y1Bl9pMFlPB9CnV10+TXLlXE76jpCXBA1nwbhDu6tLXAeZbXyMhzOQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDkubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQAqy9cVEPh0gQX+wPaDipl
-5o1AgDANBgkqhkiG9w0BAQUFAAOCAQEAhAuu/NAK4zruIOA1Urdxl0DtAE5TcOFz
-D6LLaAHb3f5vbUn6BIEniEmRsONosGzn12iDtKwMj36M4tHg60n4583eiPCcsDvW
-PLggRmMY0ERDou6w9zvZfxMUZvmMK2i3ddCU5UQ0UKHzOzYFZ7xMR3J/DN+VQtse
-NYfhieD03wZ7LfjwnVq4Dx5fApZ/OFYIYk4PCqT7OEDyHFkyPVTwK6zuwTvIrrjK
-pt3Q8BA6PO/g4psVpAnc+tWUEjHWLrvozhrO5iDpoE64K+PRZQxHDr/O4LQs5yns
-g2ZlkUDD0v0pz63tjTuCMjRidOOLjhMJOl7z0wj/fArFamDK/Fgw6g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-49.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-49.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-49.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index ca21ec68..00000000
--- a/swamid-2.0/nya-49.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-49.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIDsENK6N+CeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU3WhcNMjIwMjE3MTIxMzU3WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALyet17pZLEtrQ56CQBKa5X5+HL0DNUpujW539n9hq2VixalZDKC5gIpi9xegnFoZyPNydJtVr1la6hyd1bdJJECAwEAAaN/MH0wHQYDVR0OBBYEFNvEhMBzsmZl06knJHtoLHnwVzQlME4GA1UdIwRHMEWAFNvEhMBzsmZl06knJHtoLHnwVzQloSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAgOwQ0ro34J4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABqTTVm8Xb7qJaua41aAqlewFNX00R1LVx/HN3KokiuvvCDGbH2IaKrlLTxASNTzltZd2x9fxlrkvXd8xZmxaLc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-49.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAIDsENK6N+CeMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU3WhcNMjIwMjE3MTIxMzU3WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALyet17pZLEtrQ56CQBKa5X5+HL0DNUpujW539n9hq2VixalZDKC5gIpi9xegnFoZyPNydJtVr1la6hyd1bdJJECAwEAAaN/MH0wHQYDVR0OBBYEFNvEhMBzsmZl06knJHtoLHnwVzQlME4GA1UdIwRHMEWAFNvEhMBzsmZl06knJHtoLHnwVzQloSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAgOwQ0ro34J4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBABqTTVm8Xb7qJaua41aAqlewFNX00R1LVx/HN3KokiuvvCDGbH2IaKrlLTxASNTzltZd2x9fxlrkvXd8xZmxaLc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index d86fc0f2..00000000
--- a/swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-49.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALaxoNE9Po+PMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHoWH+BEiw7JWj7Xu/3wdHMaQucysuwS92gUjzy83Qt3kV8vHpc1BlhE8w3K0yB73eq+rwWAphD48gDyJqXf2ECAwEAAaN/MH0wHQYDVR0OBBYEFCpWaZj/0nmcPfpThsiyqvW1D7mLME4GA1UdIwRHMEWAFCpWaZj/0nmcPfpThsiyqvW1D7mLoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAtrGg0T0+j48wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHDcvXeUrdOTWOw2a1Q/0Gea3eVU1RyBcgDwd+NBD9JCnMBd+fG7XNZk7Oun5mC3D4pSazffaJYSHVvQm1kyv/4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-49.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJALaxoNE9Po+PMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANHoWH+BEiw7JWj7Xu/3wdHMaQucysuwS92gUjzy83Qt3kV8vHpc1BlhE8w3K0yB73eq+rwWAphD48gDyJqXf2ECAwEAAaN/MH0wHQYDVR0OBBYEFCpWaZj/0nmcPfpThsiyqvW1D7mLME4GA1UdIwRHMEWAFCpWaZj/0nmcPfpThsiyqvW1D7mLoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkAtrGg0T0+j48wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHDcvXeUrdOTWOw2a1Q/0Gea3eVU1RyBcgDwd+NBD9JCnMBd+fG7XNZk7Oun5mC3D4pSazffaJYSHVvQm1kyv/4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8452/idp/profile/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/nya-49.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-49.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 30d0368d..00000000
--- a/swamid-2.0/nya-49.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-49.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-49.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-49.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-49.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALTiBEkPLlfdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU1WhcNMjIwMjE3
-MTIxMzU1WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1L+/jXR3Q9zIDrKqsdWgDBriDIWtDxsx
-1HP+wyA/3z5hd3vFsJF5P9bDRTcFc6ljEmil2FyEjTf1Y6djUEyE1qKX1F41ruRr
-k/owVdZfZqK+IgLoEPZ/6lqZxkc7KmMAfTQ+qcJmtlUuvWU3nUQDuQHhu52L82g2
-xfsFV4NVSXOobhqdI+P0V6fEisxLc60n16wgZrurMUBCA0pO7J0PsDi1cMp5bVwl
-OGbsZAfEkSsshWnyQauk+koUoSPBV6KCwucXoXJWuU5DO1GAheG6HZQSUQJo94VU
-F1O8Gm1IHkCgFPSmN4Hx11C9yLYy0rXUYPGEgzYER+29cBnVYzzwAwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNDkubGFkb2sudW11LnNlhiJodHRwczovL255YS00
-OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQiSnwaPNRPV1Em8T1f6YIQ
-nbBnWTANBgkqhkiG9w0BAQUFAAOCAQEACtGYaAJuNV59Eb3BP3y7hZZqtWKGxzSE
-kUfCzYTtP/tcKs3BlwV/hbgiNkiZGr3tSIfLYapZWtZMQztTWOt9C0jGPLt3UT/a
-I3BT3dZOB6uUc8hYSprLUFNSPcKx0Vz5NxclRcgH5fxdOypdWkCwJ8FJBv6oHndh
-3XKIuZBCQODjwTFER9ikJ6PsdfINtTzX9kZPrqpHzNgHLZAdycE2c817fq71vcfp
-XsDVoeJyz4ZLwPmKUnh8aaUn0QNS6sf4BgUSoPz+jPlmlDLmDEErxw9xGTL7arLU
-wqJdwlaNHBJYQM/bE57IEQo+w6ImS+vTRmv4jFpd0UkiiqSlQ1DKRw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-49.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-49.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-49.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index d949ab96..00000000
--- a/swamid-2.0/nya-49.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-49.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP7V6pEegm05MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU4WhcNMjIwMjE3MTIxMzU4WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPYuZlahlEeh1/3xCQuWkNeinm/ZZFsHSBBeb5rVgVnaJY2GXhDHB5YoYjMtYog0TZLrV5H83Ba+W3xAPgdyL0ECAwEAAaN/MH0wHQYDVR0OBBYEFDe2MefKrwUbk++BPltiNLICNiQEME4GA1UdIwRHMEWAFDe2MefKrwUbk++BPltiNLICNiQEoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkA/tXqkR6CbTkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAN5tjBhXGUrrzN+xsqpxigHN1NyeOciMDlKbfsncbBhRgHU24vNZhUyzHNqiZx1LVPif6WoCr8wbAHPaF4YU9bE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-49.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-49.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAP7V6pEegm05MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS00OS5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU4WhcNMjIwMjE3MTIxMzU4WjAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPYuZlahlEeh1/3xCQuWkNeinm/ZZFsHSBBeb5rVgVnaJY2GXhDHB5YoYjMtYog0TZLrV5H83Ba+W3xAPgdyL0ECAwEAAaN/MH0wHQYDVR0OBBYEFDe2MefKrwUbk++BPltiNLICNiQEME4GA1UdIwRHMEWAFDe2MefKrwUbk++BPltiNLICNiQEoSKkIDAeMRwwGgYDVQQDExNueWEtNDkubGFkb2sudW11LnNlggkA/tXqkR6CbTkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAN5tjBhXGUrrzN+xsqpxigHN1NyeOciMDlKbfsncbBhRgHU24vNZhUyzHNqiZx1LVPif6WoCr8wbAHPaF4YU9bE=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-49.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 440a3bae..00000000
--- a/swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-50.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-50.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>nya-50.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-50.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOfUla/9GwRqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDAxWhcNMjIwMjE3
-MTIxNDAxWjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEece+RKhm3N1BP7W7mQL1VUIWEezbYL
-PtP8xJaTQ0dBJyW4qO1dQFCxxBG2jRqBhphH85YOUWP6pwvy14xgJNY4GlkQ1Ljq
-m7QHB1Oe9xDsbLeQdpnMFYJpt9Xqk9fUzWWYP6vi/TUTZqexEvLvRPZA8tXFc+vE
-5NS2WXvAp1DU1LMKPcEfD0rXbJXLuJL5CqDYDtGe5oIKDv3ZOjUY/yxLlHQaDcZg
-Vz8R8k1BgvfKm3QkaubiDzPL3oRqgB5jGq7IA2/Iu3XVPZ6fTvCSdm9NlUgwCyy7
-q3YbSNx8tE7Fc6lsMkFsRUtZ1/7r8FpsJb3Wy05+NHwKQgT3YXrB0QIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNueWEtNTAubGFkb2sudW11LnNlhiVodHRwczovL255YS01
-MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRjxiq4M/Q3PE56NMgQ
-4qPCk+CE0DANBgkqhkiG9w0BAQUFAAOCAQEAkf0Bi3RxWVukg4Y6fg+5W7OkPczh
-+F14HIkOBF9huEzs8KzkamJMmqBVTyozcaLe3Ohrml2FNShjY0TA4YQGgVLUWGOG
-HnSlB5IYgQQ2l3P45e6H3eTVbdeXFSTLn27Me2xRtoBAspAhCAYlW//rtfuGM9HD
-frfKH3aYFfVnWzumnaCReB9AL5P5wjRNWqeo6JZeQI3CTLvbm3Ox3B0cXh1mk/4T
-FWmypCx6sjn+v/7fckstlh1QVqANsRkitYiYMs08UUXHnobqffpk2fWqzO1qiTt4
-PVB1CNb1sjfUbkvX5zSoIKsrl3E1T1k70ec+aK0GKun8Q8kLQ4T/ApeVWA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-50.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-50.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-50.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 89c83e2c..00000000
--- a/swamid-2.0/nya-50.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-50.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-50.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>nya-50.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-50.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAL4Oqaf6wmwiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzU5WhcNMjIwMjE3
-MTIxMzU5WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsp9U0/1GzGisdx6nprPQFlsWIAm8WcIg
-wX2z4zEUTqWX281jEKZeiQPBiVwqgstbFD2imeagvKZu7XMdRdNu8PoJCGR9w34s
-XFVM/v+OGpeW6PAqZc7tZuZyYPnWFXYNMWbkyHx9toytD7FB9c0VpQ/3vEL+lxH2
-rykt3B+2rsBZKZ9JF4qzOkdoJp6OUWg2tLkMwfkI6TbNQGaKyn1nX32BFufQ/PUt
-5xQYg6GYjOWNw9EzOwwZOAkHlTMSviLTw9pRbaxaFjjWjCqyRA0TgPA6pmt4/eHK
-fC+G0zTOocG2046xoww3Z5Q8TzAFtzb0I2hJqUSsJfL49hRJJB8JsQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNTAubGFkb2sudW11LnNlhiJodHRwczovL255YS01
-MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRdGpgRieLuLGQQH5UpGDSz
-u9uS5TANBgkqhkiG9w0BAQUFAAOCAQEAJL4Dd/lRMO2KRcdjcCFKDV5dFFyKreXI
-K5Lt08Ug7prKXIjF77pdJQ9SuJWj++O6vCeiuqECleEze/X3fawEyGvcVEiyXIkK
-IAxydZvbdrCQ5NLTD/ty5lZNHkU++KqGNvP+wGZCQaIHOttYcfaBwUS/7gFiasfk
-NfmWRBX8sx6YkM39n/UAsPkZqFvBEY1F6PXOCLY0DarT0Uql9mzphkApzrqtsenU
-bIEkJ+83BF40dm08OJofJ8FdPlH5k007I0GRCtbgPnlpbYgdIrgf92dCBRARnHL9
-AfvBMf8ezEVhZNiBN6F+cZ1IhAGGQSXWyXhyUY3xYjOL/tLKJMRwTw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-50.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-50.ladok.umu.se-dw-idp.xml b/swamid-2.0/nya-50.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 0df7d36a..00000000
--- a/swamid-2.0/nya-50.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-50.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM2JMlR9GhRHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA2WhcNMjIwMjE3MTIxNDA2WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANw22srwDj45JduexD6YHHi/OJFr0M6X6Jcj5UNmtY0mydAfYwLfhL+pZgwve19JweratduM2V8Y5NcikbW6UjUCAwEAAaN/MH0wHQYDVR0OBBYEFGWH/ypdkLCi9kVXotsJTIQTiIcAME4GA1UdIwRHMEWAFGWH/ypdkLCi9kVXotsJTIQTiIcAoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAzYkyVH0aFEcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADkUNIGHwUSXCMOYdHFhgdzZFzf70e6rkiREVzlOYRoo0ZgR9oWW3FuFl0PM+SqbdwsUMcQF9KlXIqnOhlhP3zM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-50.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAM2JMlR9GhRHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA2WhcNMjIwMjE3MTIxNDA2WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANw22srwDj45JduexD6YHHi/OJFr0M6X6Jcj5UNmtY0mydAfYwLfhL+pZgwve19JweratduM2V8Y5NcikbW6UjUCAwEAAaN/MH0wHQYDVR0OBBYEFGWH/ypdkLCi9kVXotsJTIQTiIcAME4GA1UdIwRHMEWAFGWH/ypdkLCi9kVXotsJTIQTiIcAoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAzYkyVH0aFEcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBADkUNIGHwUSXCMOYdHFhgdzZFzf70e6rkiREVzlOYRoo0ZgR9oWW3FuFl0PM+SqbdwsUMcQF9KlXIqnOhlhP3zM=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 7b59dbf1..00000000
--- a/swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-50.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALZGAenn5jIIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALzphMV8K+YlBHcRY+zYv8/fS/w+o3Zr0DHW5z2mFOeJvbpdZ40D+t7xV4EWEQs968y/Hk9qO+Ux/+4vAotJinUCAwEAAaN/MH0wHQYDVR0OBBYEFOBX6Tl+K0VwRvDkf2VKTgbPtTYZME4GA1UdIwRHMEWAFOBX6Tl+K0VwRvDkf2VKTgbPtTYZoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAtkYB6efmMggwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHBQz3YyWSUElipAFPU4vAMdd1pwuY+PEWpCzkmeICEF8OOxh3QNy5RW23U9kxtNWC87NGA3cowghgTnPNYcv4A=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-50.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJALZGAenn5jIIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwOTIwMTczODQyWhcNMjIwOTE4MTczODQyWjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALzphMV8K+YlBHcRY+zYv8/fS/w+o3Zr0DHW5z2mFOeJvbpdZ40D+t7xV4EWEQs968y/Hk9qO+Ux/+4vAotJinUCAwEAAaN/MH0wHQYDVR0OBBYEFOBX6Tl+K0VwRvDkf2VKTgbPtTYZME4GA1UdIwRHMEWAFOBX6Tl+K0VwRvDkf2VKTgbPtTYZoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkAtkYB6efmMggwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHBQz3YyWSUElipAFPU4vAMdd1pwuY+PEWpCzkmeICEF8OOxh3QNy5RW23U9kxtNWC87NGA3cowghgTnPNYcv4A=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8452/idp/profile/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/nya-50.ladok.umu.se-ecs-sp.xml b/swamid-2.0/nya-50.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 9ef842fc..00000000
--- a/swamid-2.0/nya-50.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-50.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://nya-50.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>nya-50.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nya-50.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIokpeEwV7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA1WhcNMjIwMjE3
-MTIxNDA1WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxB1/xbbsaJ2X1hTp4c+UVgVmzNmSP6yq
-8mGVcRRF2mq6oZYYh57YXA87IoD8f1gJEPO4oi0NuUb5S9LwE2rQFyantqP8DzzG
-qWgOdRI9zgNPPPNSpXKmz7c93iPWfGs9RpUSTWd2jVGCBkoAsoVauwkcasvjaHEc
-5JLdZ5uCBqDwkW2DyrMw/xsUc7hGJRJHKGgQWLlTxwRi+qXLAgwXiY6CQ1a3/5rY
-cMSKcdX1KVmxtwC0I03jgqTy4HyfiEN3WWlZmmfTvOmsKyBcC1gEc0TV+yXAxIQ2
-WVOmxNWosmTOWdZk0FYYXv8LwxiU7DGssqN5AbWlxv5e5p5tC1ocjQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghNueWEtNTAubGFkb2sudW11LnNlhiJodHRwczovL255YS01
-MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTSmDNwjs+ZXnFvDieHFIid
-ZUGVrDANBgkqhkiG9w0BAQUFAAOCAQEALQQUWTqG5UoSk/PJpPpYDR1I2LvAWScE
-sZRpkUVTz8m6YZ6lSB1xdrW5TajKJt5NnF6hN/Ju8JB5jmAkMSn7kTbKliEkCHXw
-tMtS65NtEy+0yiAT+3kt9R83Sh7GHEr4qVSq6yWPdGPTmPtqMvRRYqOA4emVMvJr
-EmRTpg5fswe5HFbR3Z/xKy/0kFKgrD702RZyJQKNI+WxpTOaHocZfm8fq2r8nr7J
-1b2yKp2xUOgORRyz/vbb+4FUXEWAbUM/isn/yEzXPnUjX7kNl3RVCVgy5vfNBR1l
-Mtb7xKVUgESXBWbefVO7KqFsgXC3H0WthuTgTtskerkx0f+gylcp0g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-50.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nya-50.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/nya-50.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index c9a16ebb..00000000
--- a/swamid-2.0/nya-50.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-50.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPGApjABx8azMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA3WhcNMjIwMjE3MTIxNDA3WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGg0aSovDlwHsWbyqTZsuSwca2z8Fr9+/kwAK72ost926fOzqgQKZheJe4CBkTnpIHEOwDyaW6Gml2zSQAF548CAwEAAaN/MH0wHQYDVR0OBBYEFFkuTR4a+m+xC7LmSqgfvXkyuorqME4GA1UdIwRHMEWAFFkuTR4a+m+xC7LmSqgfvXkyuorqoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkA8YCmMAHHxrMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHWOjSzJ3uedkd11ZX045Cc0Nq0mQjeDGR/ytNlYgJjUrCmJRhWJh2ZM12trRwQRdET3eyJqEsVRPyET0FKzoXg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-50.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-50.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJAPGApjABx8azMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS01MC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxNDA3WhcNMjIwMjE3MTIxNDA3WjAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMGg0aSovDlwHsWbyqTZsuSwca2z8Fr9+/kwAK72ost926fOzqgQKZheJe4CBkTnpIHEOwDyaW6Gml2zSQAF548CAwEAAaN/MH0wHQYDVR0OBBYEFFkuTR4a+m+xC7LmSqgfvXkyuorqME4GA1UdIwRHMEWAFFkuTR4a+m+xC7LmSqgfvXkyuorqoSKkIDAeMRwwGgYDVQQDExNueWEtNTAubGFkb2sudW11LnNlggkA8YCmMAHHxrMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHWOjSzJ3uedkd11ZX045Cc0Nq0mQjeDGR/ytNlYgJjUrCmJRhWJh2ZM12trRwQRdET3eyJqEsVRPyET0FKzoXg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-50.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/nyautb.ladok.umu.se-ecs-idp.xml b/swamid-2.0/nyautb.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index 5bc645a9..00000000
--- a/swamid-2.0/nyautb.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nyautb.ladok.umu.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBtDCCAV6gAwIBAgIJALa8GwfmKk4gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YXV0Yi5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMB26bGcH+dXiO5fs9gakdNWgcR7bbiat1F4GRH2XCe22vDfs+NcZzR03Dmr2dAHvRNCBwUjY+/BYUOfdJX77xkCAwEAAaN/MH0wHQYDVR0OBBYEFNtKBTHYRJIsP5SYC6gq0/qGzPiAME4GA1UdIwRHMEWAFNtKBTHYRJIsP5SYC6gq0/qGzPiAoSKkIDAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlggkAtrwbB+YqTiAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACHjHSOJaBcnVs5j845c04mYqVyZ972kRfOfNuLdTzZJ9NwEXEF+jHcIKvU7nYpFUItvyrLqA1GXN2AFb5wYZdg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nyautb.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyautb.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nyautb.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nyautb.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBtDCCAV6gAwIBAgIJALa8GwfmKk4gMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YXV0Yi5sYWRvay51bXUuc2UwHhcNMTIxMDEwMTIxMDAxWhcNMjIxMDA4MTIxMDAxWjAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMB26bGcH+dXiO5fs9gakdNWgcR7bbiat1F4GRH2XCe22vDfs+NcZzR03Dmr2dAHvRNCBwUjY+/BYUOfdJX77xkCAwEAAaN/MH0wHQYDVR0OBBYEFNtKBTHYRJIsP5SYC6gq0/qGzPiAME4GA1UdIwRHMEWAFNtKBTHYRJIsP5SYC6gq0/qGzPiAoSKkIDAeMRwwGgYDVQQDExNueWF1dGIubGFkb2sudW11LnNlggkAtrwbB+YqTiAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACHjHSOJaBcnVs5j845c04mYqVyZ972kRfOfNuLdTzZJ9NwEXEF+jHcIKvU7nYpFUItvyrLqA1GXN2AFb5wYZdg=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nyautb.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyautb.ladok.umu.se:8452/idp/profile/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/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 473139e0..00000000
--- a/swamid-2.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testc.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 9d8f551c..00000000
--- a/swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGQubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NTIxMFoXDTIwMDkxNDE0NTIxMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwZdZqotViKBtzPP1HqNi1JN4x0DmZ8Y4dAdui0MX3H+v+XjveLUzMe7TxTRMJf+T/O9dwyHNkINtbwC1vZkVjQIDAQABo4GKMIGHMB0GA1UdDgQWBBTkceCKQcnu3PNBU4JyuMjT11F1kzBYBgNVHSMEUTBPgBTkceCKQcnu3PNBU4JyuMjT11F1k6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0ZC5sYWRvay51bXUuc2WCCQD/e3K+WHLQkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAL6D6pwwnJ8KeBkmYbi+rN3Xmurnp7Umjzr8XQXNoa4SA24RoXquQR83nx1hN7qsYL6zllXqkV7uJrVtNbaVAAw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/wb11.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/wb11.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 9217fd58..00000000
--- a/swamid-2.0/wb11.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://wb11.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJAK/RKyYmPJldMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTM0NFoXDTIxMTIxMzE0
-MTM0NFowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC5hvtEpXEl1hnktnuRBvjCTLIJGEH5poZax+Sk
-0eaPg0vF+qkJMcyzc7VRyilLI+d1goQiyPmeSMy/2Ltxh+qhc9ET7miwq9bHHNGT
-Ia/Jf3Ed76+4KDAJMVu07KwOLaC+NNccTfs5fn9d5Vy9HMncRxwlzUJkMFWk2lkk
-hWHlx9gPtBIYm3nr6xJATQWWua0B068ZBkQFSPYYfa65m2EaOv2vmR2HY2hOQIKi
-VLMfrft1/c54429mBopAHmfuFMWf9zgaR3As1zf+x3V2/3+/si95UniXrhPO80XT
-3MJCZaCJsaf4hGTU/+HrU5Uq5p7oADrUgqep61Zv1gFvcwhpAgMBAAGjZDBiMEEG
-A1UdEQQ6MDiCEXdiMTEubGFkb2sudW11LnNlhiNodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUtwpVF3ilNA06kTMB1MRiYUtxyOow
-DQYJKoZIhvcNAQEFBQADggEBAB/w0nCQQshFHo9NDFgVYl1QV2uPiNT0doPS3SK7
-xnjiVSNCax/o6F+KcFtBGDEsF9L3D0yJ0BcONZmN822k3tBBbZbpHNy0SMUEsHo8
-cJjWJKRpjX2xIrqhQVkvys13z+/ZaQDZ714i4Ix5hN1RvNNZB0f0UmslM6PaMqEu
-BEKjnO6kM3QEK6/n6G1i9Z0JWQrNGD/7Bw0SvwTWSrU5wbQ5jPn0opc7oj6pLdkr
-+9HsDRob+BDYoXPUz563NnLhpRRdnN/ihIJ4cl1ZF1ANrUSYP8dXqtxY0gCz6BZl
-0xMs5JwXT17by5tZXmPKrHNqF8Qj03fnRoa2UnFh21KyJXE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/wb11.ladok.umu.se-aws-sp.xml b/swamid-2.0/wb11.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 867b32b2..00000000
--- a/swamid-2.0/wb11.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://wb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAMtkfsQuw4jrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMFoXDTIwMDkxNDE0
-NDgwMFowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDZo2PhhMygEkhrL9aOI9juCAd8mMUzAjMvOyeM
-XaRvy0TWAosbYrISzJ5RRhlz8fISbJBi5fNc4EXfOwhwt+zDRO38WD6ZQ6tIingg
-/MDlt7kAIReVApqzFpuz+KyJTTnkUCBG88Ta+mS/8ueQLtT0bRWraRktjbsh64By
-fJyxjvxQrCIvL73KFb9UQ9pDOHd6MiBSd5CI4bTUoEtTZ029008PGVNJuW1h8qUJ
-cEmlzs9XICkO2/FwH5ZNitjR17QDPuqSs2XoUuhiLENKbPrd4QJmeo/T+Sdd4NID
-duiVDLGRHoQhwKoFW4CeQ08RhVT+NSJhk00w4NtomCiVKnLhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUm72guLzA9qOEzsfksOLm7Qc6qfIwDQYJ
-KoZIhvcNAQEFBQADggEBAI3pgPZcnnJiJ+s69Jn9jwX6JNkN/5WedCSNy3qdNCpU
-RIyxKvEXBcfeWcA6GLeXGYpEtkyPZETh9ED9ulkj++Ve/80aA19hmIpCFBT8jtjO
-ds7YJbL6KekyJrAdI3fKkEsrtbNLrC+2c8oeGDyifffa66bAOr4YwAOFLcsSGnCg
-OCOkAB0kG4D+JL3wUj/Ss4t3wcQeXf0o1HbF5KGJVntPYczwSWoYttsghzBWD7rH
-Jh6Z+4xY6ghKm2UzuXdEojHvbL9/R8qxsJt/ZsD6eRc5zvH8CBGhwJQ4snkUU1Xd
-r47Cpg6APAhpPp1KRCo+dy+2rnvbmWi8LukIaSt25UI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://wb11.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAMtkfsQuw4jrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMFoXDTIwMDkxNDE0
-NDgwMFowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDZo2PhhMygEkhrL9aOI9juCAd8mMUzAjMvOyeM
-XaRvy0TWAosbYrISzJ5RRhlz8fISbJBi5fNc4EXfOwhwt+zDRO38WD6ZQ6tIingg
-/MDlt7kAIReVApqzFpuz+KyJTTnkUCBG88Ta+mS/8ueQLtT0bRWraRktjbsh64By
-fJyxjvxQrCIvL73KFb9UQ9pDOHd6MiBSd5CI4bTUoEtTZ029008PGVNJuW1h8qUJ
-cEmlzs9XICkO2/FwH5ZNitjR17QDPuqSs2XoUuhiLENKbPrd4QJmeo/T+Sdd4NID
-duiVDLGRHoQhwKoFW4CeQ08RhVT+NSJhk00w4NtomCiVKnLhAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUm72guLzA9qOEzsfksOLm7Qc6qfIwDQYJ
-KoZIhvcNAQEFBQADggEBAI3pgPZcnnJiJ+s69Jn9jwX6JNkN/5WedCSNy3qdNCpU
-RIyxKvEXBcfeWcA6GLeXGYpEtkyPZETh9ED9ulkj++Ve/80aA19hmIpCFBT8jtjO
-ds7YJbL6KekyJrAdI3fKkEsrtbNLrC+2c8oeGDyifffa66bAOr4YwAOFLcsSGnCg
-OCOkAB0kG4D+JL3wUj/Ss4t3wcQeXf0o1HbF5KGJVntPYczwSWoYttsghzBWD7rH
-Jh6Z+4xY6ghKm2UzuXdEojHvbL9/R8qxsJt/ZsD6eRc5zvH8CBGhwJQ4snkUU1Xd
-r47Cpg6APAhpPp1KRCo+dy+2rnvbmWi8LukIaSt25UI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/wb11.ladok.umu.se-dw-idp.xml b/swamid-2.0/wb11.ladok.umu.se-dw-idp.xml
deleted file mode 100644
index 97d72433..00000000
--- a/swamid-2.0/wb11.ladok.umu.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/dw-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAwd0k7rzbPDuHgRR0a9bMXfZBBHGzXVLCgcXDng9bO0Oi/XpIqi1QkPwN0Q5S7FPLHDcc9u28Dyqi6465Oxfp5wIDAQABo30wezAdBgNVHQ4EFgQUc8cPrNUCZndzXmUmJQC1ZaA805kwTAYDVR0jBEUwQ4AUc8cPrNUCZndzXmUmJQC1ZaA805mhIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkAjVGwxIT2lb4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALADoI4EEbZ0ke6IxfKqzPoEd38R4LL9NG9068rFJPn53l26Ggq6EHfpGCKJwAS140zwyAmHIzwOXCRkPThIY7g=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/wb11.ladok.umu.se-ecs-idp.xml b/swamid-2.0/wb11.ladok.umu.se-ecs-idp.xml
deleted file mode 100644
index aa8eedf7..00000000
--- a/swamid-2.0/wb11.ladok.umu.se-ecs-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAPzFyhFVA4HWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA0AAzWTbI6q6mggnI/HCOx4pLlP/Q8Q8PMHYHa8VYllFog2/dBblLq1t2zq3zdNSK7J9W01hhncRTm1NuAp/pAQIDAQABo30wezAdBgNVHQ4EFgQUuKstxp6djkvVjL2whcKNeOzKAP0wTAYDVR0jBEUwQ4AUuKstxp6djkvVjL2whcKNeOzKAP2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/MXKEVUDgdYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM981+w/6sk7OF2/huVe8s1OTgAKGwLFMXOkDxxXJV968wgWgXO1UOQeq9yjD3T9BbMm/S9fLTE12l6o29s3p4s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8452/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:453/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:453/idp/profile/SAML2/Redirect/SSO"/>
-  </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>
-MIIBrjCCAVigAwIBAgIJAPzFyhFVA4HWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEyMTAxMDEyMTAwMVoXDTIyMTAwODEyMTAwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA0AAzWTbI6q6mggnI/HCOx4pLlP/Q8Q8PMHYHa8VYllFog2/dBblLq1t2zq3zdNSK7J9W01hhncRTm1NuAp/pAQIDAQABo30wezAdBgNVHQ4EFgQUuKstxp6djkvVjL2whcKNeOzKAP0wTAYDVR0jBEUwQ4AUuKstxp6djkvVjL2whcKNeOzKAP2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/MXKEVUDgdYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAM981+w/6sk7OF2/huVe8s1OTgAKGwLFMXOkDxxXJV968wgWgXO1UOQeq9yjD3T9BbMm/S9fLTE12l6o29s3p4s=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8452/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8452/idp/profile/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/wb11.ladok.umu.se-ecs-sp.xml b/swamid-2.0/wb11.ladok.umu.se-ecs-sp.xml
deleted file mode 100644
index 346241b9..00000000
--- a/swamid-2.0/wb11.ladok.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/ecs-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://wb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKzpSaecCMeLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0
-NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC7iP80GpxV9jpwwo8qbnqg+tpc1D9biCcAaZGj
-e6A8uwVaC0dsRChltTBpsxfQdT+YT6tbSWQ1RQ5JMua4F1MuxtVzfbBuTF/u1jRb
-AtN/uSmVpsBXet3flPkbENWy0pc0KU99Vu0DS70tNiAHt942qdwpBn4u4/z5y4Pk
-vGE4WZbGyVfZOK8VeLDgz9JLcTzi2xNPFG5RBteGzCTGzsxzNODOkPHuBUAP2Vjm
-4NcQHDPX3xwxgUAtbfy34z74BCbcASENGkVi9FHSxqykSM2HoMTNKzDBvGiy1uIh
-I1RsUZKI3czalgYiIcqX3RBscq7VFuNhnfQ7aH7xtF3NqoHzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUhIcWQkZm1C4Jz03+4cl4cLXJH5UwDQYJ
-KoZIhvcNAQEFBQADggEBAIy3RxG8R6m4MwTY9by9FwzbOovhWKRJ3oN6IEwOQD/l
-x9USAEs+uVGY9DVZOW9ZnXJMndCmsVpR4SX/mRPYwEzmBEx/oQK93Bj3Bp4rFkHE
-SBDWuasgJbrWXHPQzDqL/STrqvcj7ttmnK+JUEB7th1IM9Qt2DLUgxXcNjJrQc1x
-V48Uw+hzOetz9i3aovFjaQjnsOSLOUoUJIhlT32KMVe6Y4zSCMR8ggp6RI3mX7VO
-GMabpEOjrhPmP5iIDUG2GyO3U0msnY+efBenO2kXIifxrBPEfsbLG33zGmpEYC+w
-rc/DV3C2sj0TQkCAZuxvmmM4YpmAOJ7QMQzUUY4sOHU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://wb11.ladok.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKzpSaecCMeLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMVoXDTIwMDkxNDE0
-NDgwMVowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC7iP80GpxV9jpwwo8qbnqg+tpc1D9biCcAaZGj
-e6A8uwVaC0dsRChltTBpsxfQdT+YT6tbSWQ1RQ5JMua4F1MuxtVzfbBuTF/u1jRb
-AtN/uSmVpsBXet3flPkbENWy0pc0KU99Vu0DS70tNiAHt942qdwpBn4u4/z5y4Pk
-vGE4WZbGyVfZOK8VeLDgz9JLcTzi2xNPFG5RBteGzCTGzsxzNODOkPHuBUAP2Vjm
-4NcQHDPX3xwxgUAtbfy34z74BCbcASENGkVi9FHSxqykSM2HoMTNKzDBvGiy1uIh
-I1RsUZKI3czalgYiIcqX3RBscq7VFuNhnfQ7aH7xtF3NqoHzAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXdiMTEubGFkb2sudW11LnNlhiBodHRwczovL3diMTEubGFkb2su
-dW11LnNlL2Vjcy1zcDAdBgNVHQ4EFgQUhIcWQkZm1C4Jz03+4cl4cLXJH5UwDQYJ
-KoZIhvcNAQEFBQADggEBAIy3RxG8R6m4MwTY9by9FwzbOovhWKRJ3oN6IEwOQD/l
-x9USAEs+uVGY9DVZOW9ZnXJMndCmsVpR4SX/mRPYwEzmBEx/oQK93Bj3Bp4rFkHE
-SBDWuasgJbrWXHPQzDqL/STrqvcj7ttmnK+JUEB7th1IM9Qt2DLUgxXcNjJrQc1x
-V48Uw+hzOetz9i3aovFjaQjnsOSLOUoUJIhlT32KMVe6Y4zSCMR8ggp6RI3mX7VO
-GMabpEOjrhPmP5iIDUG2GyO3U0msnY+efBenO2kXIifxrBPEfsbLG33zGmpEYC+w
-rc/DV3C2sj0TQkCAZuxvmmM4YpmAOJ7QMQzUUY4sOHU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml
deleted file mode 100644
index d1319b4f..00000000
--- a/swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDgwMloXDTIwMDkxNDE0NDgwMlowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA1ePYIrZhRM90Dia/cm4PJOODmfzu2UXWii1Hyn/mMLqzOrYwRGTXIGdPPICPzXLMDI07J3Jkaq1l00PU/uaXmQIDAQABo30wezAdBgNVHQ4EFgQUvOSQN0SbLE3Ls+z0BxbiumWiBa0wTAYDVR0jBEUwQ4AUvOSQN0SbLE3Ls+z0BxbiumWiBa2hIKQeMBwxGjAYBgNVBAMTEXdiMTEubGFkb2sudW11LnNlggkA/rRnb9XsuMQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGE74yT9acGEr44Dsup6U93RYnVzwmvHWpMr6tqDZsp3DO9h2PvZneCEKbRVIq/JH103rm1wvvRCFZ3k8+NVrq4=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/www-en.testc.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 0b183af7..00000000
--- a/swamid-2.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-en.testc.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www-en.testc.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>www-en.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www-en.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIJAPD5gylxXTLsMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy1lbi50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQzNzMyWhcN
-MjExMjEzMTQzNzMyWjAkMSIwIAYDVQQDExl3d3ctZW4udGVzdGMubGFkb2sudW11
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwR6ttyje2V8Jq90p
-j3DGKcpdB/xWrwNs9ZjznEXsFSek9KXEO1CbhI1JjxgnN7z+lcQKkdsHjZeyybTq
-/JuC4Yxy6W1SBmQpGLRF1VcHPIqtrYOIN+CKj6zUQ/8xcCb3EG7GWncwdbJz139q
-eabTljBOW0BBUMHQ5y4qCMb6ldNXMw4KNTt1ZNrJpQP7A+uYmv9rRDnkdSGzNACw
-/p8PTApQVJKmJU0Wl3zQPx1p+FuNIm+F6XIwsdo1hn5lqvX8sizMpxkEYvaD7EdY
-Mk7s/8AIgkpR52dr1R1he5OFH0nsuRLyyGDHDLVcWPD1yuqVMNcMikEDzB1ivFIZ
-ULTp3wIDAQABo3QwcjBRBgNVHREESjBIghl3d3ctZW4udGVzdGMubGFkb2sudW11
-LnNlhitodHRwczovL3d3dy1lbi50ZXN0Yy5sYWRvay51bXUuc2UvYXdzLXNwLWVu
-MB0GA1UdDgQWBBTxMWuvQbAhx/SFfNjjCcT0JjvFiDANBgkqhkiG9w0BAQUFAAOC
-AQEAmdk4A8kxlQo1RvwFjCR+fFxducI0RXlnrfcQ4Vn/aebpJ0/C4iYQj2+pECix
-RU5HICdi3UbrlYVsubVIcyJcIoHV6WjkFGh7pTFv4Crvganir3FizqwSPHxjnpNv
-dKXTs3Fr8ubKVuV26vzJA7abxdqm64XTMrM6RxxzxjbLqgdNi3Z62ZganPmEGC+V
-tEyRklU7ZzTJDYcIYMJE401ng6Aaf1UrGrw5PGUfaMwgEdxD3Eex04vPTCEDy1FG
-SJI215JaSmaI1Sg7jrIxL0wrIPxjRs3xQkFBinPqVWdkmSWtcjssi0vM8Iv4lb2Y
-E2gDCP4Dxhit8z81uTyc843g/g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www-en.testd.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index 506d09fd..00000000
--- a/swamid-2.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-en.testd.ladok.umu.se/aws-sp-en">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www-en.testd.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>www-en.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www-en.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIJAJzPrOxzZijAMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy1lbi50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTExMjE0MDg1MTQxWhcN
-MjExMjExMDg1MTQxWjAkMSIwIAYDVQQDExl3d3ctZW4udGVzdGQubGFkb2sudW11
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApFaOz+KOeFQAMd+w
-eAaaeixrNoq3oAFLLkAg9tI0RcoKJD/ssNA/BytGn/T+uoDHws/yak6YO8/sfH5k
-BfgCxEc7WaBreXBkW/YpwAAx4qSaIx/3vdj/c6ytosWynjAbirOAIAk1UTEHgCKI
-SxqnFzwlWJc1pSsAz8ayQipJkOPgTEWiuEd7+mNC6KHmvWTZ38zwLHUYdsJuyJl6
-eEMdPUgPpt9CbVrHEqvLTIrnmQr7oe7wrGsCi3uJ+Sa1TgALTbg1dhR+eB+HNO4/
-IBQqr1M8yG+c9dz1nMmTeRyu6Fqc+E7UdHofECuDrR7Tu5ah4pVFlRqIaCYjSPZE
-TX1FzwIDAQABo3QwcjBRBgNVHREESjBIghl3d3ctZW4udGVzdGQubGFkb2sudW11
-LnNlhitodHRwczovL3d3dy1lbi50ZXN0ZC5sYWRvay51bXUuc2UvYXdzLXNwLWVu
-MB0GA1UdDgQWBBR4fBmNgW6ZFa/mlVA1NpQiGZMBiDANBgkqhkiG9w0BAQUFAAOC
-AQEAREpcQ2wEyp5vaD8Phu/pKKjimY/XT/ypfnyOA9au957S2J7c1pGhjQ6cZp2Z
-JSJru9ltM1tyzhb3V6ShmOUI3GF94dFi2OYl3KYjrHF+Qxay8lU6cjoZIvC2Gcpa
-YX+vO8HLEa6IYn3K24cKlaepnhViSnIR6mT6Cus0p69JzLnBzZj9g1F92ymuiUwq
-M4qI030C477k8wSjFZIClzKi74JKZjiXftBdyjSy5FIdJTvmIUFy0S5v6QzM4SPr
-0FvdPJO+0xkeYmKPn2/6KW/H1K35BSbwGLfcbyM5jv78oWAHJRFQd9Ml1fnw3x6p
-UB28P1ZfxwQO+Evo145MDgcHyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.testc.ladok.umu.se-aws-sp.xml b/swamid-2.0/www.testc.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index 4c191189..00000000
--- a/swamid-2.0/www.testc.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testc.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.testc.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.testc.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.testc.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAIYP6k/Y1l0cMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnd3dy50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTExMjE5MDgyMDE4WhcNMjEx
-MjE2MDgyMDE4WjAhMR8wHQYDVQQDExZ3d3cudGVzdGMubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA27A3UNRlDCa0Gn0Y0SjuByD9
-tDP0RpeZb7dI6fyMVDTQOVJW89+x5VMKuuW91umsrcATVBdRG4oR09h5VNah8FbY
-0s1wTB4EpUMKklR6G+gfarBbBQ+X1YEkTCoPqZiJt1pqEzI1OcigOAPhDjV37EIT
-EAGN/9dxex9tzRoRbQv2d0IxYXcGYENhENL3oRCxkNgDOKoJIjyciu+mzILgDqSZ
-va9/1zFZvcuMGxMX0nDBcm/nZGBgmFry/ytPBVyV1Zzfzsx3+LqE5iNtJ1BMPOUj
-5NhAKwhaOnVRxgHRDhEmcbPNsVHeDgBD7Nc0mIBfZc8/BisFAQnpH4tfdKQ3lQID
-AQABo2swaTBIBgNVHREEQTA/ghZ3d3cudGVzdGMubGFkb2sudW11LnNlhiVodHRw
-czovL3d3dy50ZXN0Yy5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRkdvWc
-VbIb+PU2+ElOB+iyvHojazANBgkqhkiG9w0BAQUFAAOCAQEAPykWqZtyAVDmTiTl
-A/BjzIGj9cvmCcAV2mVOSPFzVqVWdsG13npZ8Gtr/psrg5X6tZ6eUwC0dpgAbgS8
-Rs0uLh/nTRFVVe9Rlw4bQTJtVt+i1yTR4YwHdi2Yuzz1r+z1L+qCLTqTRF3r85AR
-EpURTDcXfJViUnMdHc96Y5JVLGHWnIJnT70nGZd70zcs6h0lfgpLien8NngS2ukK
-QVV2tgolE6miCvhG6r2zrjssn2+5d8d+/tV6v+51nVmgJGlLlvlyRBNvSlGAE1bU
-X60/OQELWNHjJebgr+3O339VNs6jeH93PZFgsHmqPFvLY/czPXkc9GiQO5Yox7aC
-XwK+Eg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.testd.ladok.umu.se-aws-sp.xml b/swamid-2.0/www.testd.ladok.umu.se-aws-sp.xml
deleted file mode 100644
index dcafb5d7..00000000
--- a/swamid-2.0/www.testd.ladok.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testd.ladok.umu.se/aws-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.testd.ladok.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJALZH6pdyDdXDMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnd3dy50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTExMjE5MDgyMDE0WhcNMjEx
-MjE2MDgyMDE0WjAhMR8wHQYDVQQDExZ3d3cudGVzdGQubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzCsJZE2JD1Sol9NvhsCZpmpM
-TP5H46hlEqD3MDSoBNNlwQ6dD15WkaxRgm//fc1xjRoTjjb6J+Crm0Mc5+8NkMjF
-UrIUjvmOeRdcXF/67wQBnmLqQSBqHEznv3C3Hqo8djZEulrxWkCnU3TTfpsEvaCx
-A4k2OjMN3tJjP3R0h9HT0v/Nf9d4AXC62/eelSij0PNprORcUYeGdLefC53kuLUU
-IMhe+CcpBIdzD0uYoFizRM0aDCTHI5c1MdbyL8lUO7c/Jf92qIhiJh32FROnmXGd
-b/ujrY04RKz/dRmhQYJAlPfujO4om2WXm2MS9d8yCCetXM098KWcRR5eFzIIxwID
-AQABo2swaTBIBgNVHREEQTA/ghZ3d3cudGVzdGQubGFkb2sudW11LnNlhiVodHRw
-czovL3d3dy50ZXN0ZC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQ/4Y8e
-qIq3yLheiAv0NNnlbvpj9jANBgkqhkiG9w0BAQUFAAOCAQEAT0TEZnH4U6tnd808
-Jij8TZg0c60puQMbOK8PkUAZcmNn4Icc8kbgcWDA56pjS1/G2yKQzMNiTj6crFuF
-kRwGxAhk825j7ZY/+GI/jb0EGU2YP/mSzTgxepGQrftQG+D/ibjr8+0mjCefV3fm
-+xj8DogydXKZLz4VBnC2zligNivFtCxf0q7NiA5kp4XcYq2ZO6SdQvqmIxMd2PXE
-rd1FeLihxlF1QsL3n/uU9msBcKjeGJAdV+f9u+9Q8618OvuLM9E9LEgriLopKehF
-2WIweyndjk8enarn2oO3mYtRu19dwBgQ1iKTaU+oSv+2gzaVRcDt9QisaWWxmmk7
-AqGHpw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 3d97e2d0..e2723d11 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -5,69 +5,9 @@
   <xi:include href="swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/openidp.feide.no.xml"/>
-  <xi:include href="swamid-2.0/ab11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/at11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/ft11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/it11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/wb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml"/>
   <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
@@ -82,59 +22,8 @@
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-externals-2.0/elegitimation2-test.inloggning.se.xml"/>
   <xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/minastudier.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3test.its.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-ecs-idp.xml"/>
   <xi:include href="swamid-2.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/ecsidp.testa.antagning.se-ecs-idp.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index ec68ccda..04663046 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -1,103 +1,7 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-testing-sp-1.0.xml">
-  <xi:include href="swamid-2.0/ab11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/ab11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/at11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/at11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/ft11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/ft11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/it11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/it11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/wb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/wb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
@@ -105,26 +9,6 @@
   <xi:include href="swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/smultron.catalogix.se-8090-sp.xml"/>
   <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
-  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/vmfront.lan.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.testb.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
@@ -132,170 +16,26 @@
   <xi:include href="swamid-2.0/expert.testa.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/www.testa.antagning.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/www-en.testd.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/at11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/ft11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/it11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nb11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-01.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-02.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-03.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-04.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-05.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-06.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-07.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-08.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-09.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-10.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-11.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-12.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-13.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-14.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-15.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-16.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-17.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-18.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-19.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-20.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-21.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-22.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-23.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-24.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-25.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-27.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-28.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-29.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-30.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-31.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-32.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-33.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-35.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/wb11.ladok.umu.se-aws-sp-en.xml"/>
   <xi:include href="swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/www-en.testc.ladok.umu.se-aws-sp-en.xml"/>
   <xi:include href="swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/expert.testc.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/expert.testd.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/www.testc.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/www.testd.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-36.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-37.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-38.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-39.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-40.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-41.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-42.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-43.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-44.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-45.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-46.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-47.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-48.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-49.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-02.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-03.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-04.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-05.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-06.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-07.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-08.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-09.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-10.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/ladok3test.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-p00.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-2.0/at11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/ecsidp.testc.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/ecsidp.testd.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/ft11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/hubbletest.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/it11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nb11.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/nyautb.ladok.umu.se-ecs-idp.xml"/>
-  <xi:include href="swamid-2.0/wb11.ladok.umu.se-ecs-idp.xml"/>
   <xi:include href="swamid-2.0/bhb-00.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/portalservicesutv.miun.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
author	Fredrik Åslund <fredrik.aslund@umu.se>	2013-09-24 10:50:01 +0200
committer	Fredrik Åslund <fredrik.aslund@umu.se>	2013-09-24 10:50:01 +0200
commit	9ee70fb18dcf445d7b4e1690e0999bd0736ef5ba (patch)
tree	02f78a7ab6e9bce9b929b09a87ed4252801e278b
parent	29d2096ba1866e8c5b070dcfa1d590f672051ab2 (diff)