Removed old SP:s after decision in SWAMID-OPS meeting

author: Björn Mattsson <Bjorn.Mattsson@bth.se> 2020-01-09 14:23:16 +0100
committer: Björn Mattsson <Bjorn.Mattsson@bth.se> 2020-01-09 14:23:16 +0100
commit: 7d14d8f115974c6206f7b1f8bcaf488ecfd27240 (patch)
tree: ec3be4e367510415729c28674bcb26d8f76cfa3c /swamid-2.0
parent: 0eca84960740aecf9c2a35e3a7fd66c09d255431 (diff)
19 files changed, 0 insertions, 1454 deletions
diff --git a/swamid-2.0/samltest.swamid.se-coc-sp.xml b/swamid-2.0/samltest.swamid.se-coc-sp.xml
deleted file mode 100644
index d400c0f1..00000000
--- a/swamid-2.0/samltest.swamid.se-coc-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/coc/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/coc/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/coc/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-nren-sp.xml b/swamid-2.0/samltest.swamid.se-nren-sp.xml
deleted file mode 100644
index 1f1b2ccd..00000000
--- a/swamid-2.0/samltest.swamid.se-nren-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/nren/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/nren/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/nren/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml
deleted file mode 100644
index 9c950e14..00000000
--- a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/r_and_s/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/r_and_s/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/r_and_s/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
deleted file mode 100644
index c7bf327a..00000000
--- a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/re_eu/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_eu/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_eu/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
deleted file mode 100644
index 5754538c..00000000
--- a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/re_hei/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_hei/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_hei/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
deleted file mode 100644
index c3cd3328..00000000
--- a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/re_nren/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_nren/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_nren/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
deleted file mode 100644
index eef2509c..00000000
--- a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/re_nren_sfs/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_nren_sfs/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_nren_sfs/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-sfs-sp.xml b/swamid-2.0/samltest.swamid.se-sfs-sp.xml
deleted file mode 100644
index 4772aba6..00000000
--- a/swamid-2.0/samltest.swamid.se-sfs-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/sfs/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/sfs/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/sfs/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/samltest.swamid.se-sp.xml b/swamid-2.0/samltest.swamid.se-sp.xml
deleted file mode 100644
index 4f0c05dd..00000000
--- a/swamid-2.0/samltest.swamid.se-sp.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
-d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
-CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
-DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
-167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
-ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
-U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
-4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
-dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
-dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
-M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
-dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
-pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
-Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
-2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
-qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
-eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
-kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
-ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
-u3Qzm3Q=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml
deleted file mode 100644
index 28ce4191..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/coc/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/coc/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/coc/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-nren-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-nren-sp.xml
deleted file mode 100644
index f7c0f119..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-nren-sp.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/nren/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/nren/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/nren/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml
deleted file mode 100644
index 4cd686e1..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/re/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml
deleted file mode 100644
index e3bd2e3d..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/re_eu/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_eu/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_eu/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml
deleted file mode 100644
index 6f26777c..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/re_hei/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_hei/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_hei/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
deleted file mode 100644
index 57724b16..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/re_nren/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_nren/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_nren/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml
deleted file mode 100644
index 964819ec..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/re_sfs_hei/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_sfs_hei/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_sfs_hei/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-sfs-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-sfs-sp.xml
deleted file mode 100644
index 7bd3c0cc..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-sfs-sp.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/sfs/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
-      </ns2:Attribute>
-    </ns1:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/sfs/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/sfs/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml
deleted file mode 100644
index c291672d..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8086/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
-RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
-BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
-NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
-CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
-c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
-vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
-R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
-VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
-Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
-FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
-aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/post" index="2"/>
-  </ns0:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
deleted file mode 100644
index dbb7f7b9..00000000
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://xenosmilus2.umdc.umu.se:8087/sp.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8087/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
-BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
-EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
-MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
-YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
-DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
-bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
-FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
-mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
-BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
-o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
-BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
-AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
-zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
-+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
-BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
-EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
-MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
-YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
-DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
-bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
-FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
-mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
-BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
-o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
-BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
-AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
-zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
-+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8087/slo"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8087/acs/redirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8087/acs/post" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">ITS</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="sv">Umea Universitet - ITS</ns0:OrganizationDisplayName>
-    <ns0:OrganizationDisplayName xml:lang="en">Umea Universitet ITS</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.its.umu.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Roland</ns0:GivenName>
-    <ns0:SurName>Hedberg</ns0:SurName>
-    <ns0:EmailAddress>mailto:dirg@its.umu.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
author	Björn Mattsson <Bjorn.Mattsson@bth.se>	2020-01-09 14:23:16 +0100
committer	Björn Mattsson <Bjorn.Mattsson@bth.se>	2020-01-09 14:23:16 +0100
commit	7d14d8f115974c6206f7b1f8bcaf488ecfd27240 (patch)
tree	ec3be4e367510415729c28674bcb26d8f76cfa3c /swamid-2.0
parent	0eca84960740aecf9c2a35e3a7fd66c09d255431 (diff)