Removed SP:s SWAMID-481

5 files changed, 0 insertions, 328 deletions

diff --git a/swamid-2.0/dirg.org.umu.se-sp.xml b/swamid-2.0/dirg.org.umu.se-sp.xml
deleted file mode 100644
index ddcf4df8..00000000
--- a/swamid-2.0/dirg.org.umu.se-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns5="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns6="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dirg.org.umu.se/sp.xml">
-  <ns0:Extensions>
-    <ns1:EntityAttributes>
-      <ns2:Attribute 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>
-  </ns0:Extensions>
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns4:UIInfo>
-        <ns4:DisplayName xml:lang="en">DIRG web</ns4:DisplayName>
-        <ns4:Description xml:lang="en">ITS - DIRG unit external webpage.</ns4:Description>
-        <ns4:Logo height="50" width="60" xml:lang="en">https://dirg.org.umu.se/static/dirg_green_fp.png</ns4:Logo>
-      </ns4:UIInfo>
-      <ns5:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dirg.org.umu.se/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns6:KeyInfo>
-        <ns6:X509Data>
-          <ns6:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
-A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
-dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
-AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww
-CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA
-dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ
-szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN
-l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
-5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ
-A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
-xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
-606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
-</ns6:X509Certificate>
-        </ns6:X509Data>
-      </ns6:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns6:KeyInfo>
-        <ns6:X509Data>
-          <ns6:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG
-A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt
-dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT
-AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww
-CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA
-dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ
-szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN
-l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd
-5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ
-A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB
-xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9
-606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU
-</ns6:X509Certificate>
-        </ns6:X509Data>
-      </ns6:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dirg.org.umu.se/acsredirect" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dirg.org.umu.se/acspost" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">Umeå University, ITS - DIRG</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="sv">Umeå univeristet, ITS - DIRG</ns0:OrganizationDisplayName>
-    <ns0:OrganizationDisplayName xml:lang="en">Umeå University, ITS - DIRG</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://dirg.org.umu.se/page/home</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Hans</ns0:GivenName>
-    <ns0:SurName>Hörberg</ns0:SurName>
-    <ns0:EmailAddress>dirg@umu.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/swamid-2.0/hashog.umdc.umu.se-8087-hth.xml b/swamid-2.0/hashog.umdc.umu.se-8087-hth.xml
deleted file mode 100644
index d1ff25d8..00000000
--- a/swamid-2.0/hashog.umdc.umu.se-8087-hth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" entityID="http://hashog.umdc.umu.se:8087/HTH.xml">
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <samla:Attribute Name="http://social2saml.nordu.net/customer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <samla:AttributeValue xsi:type="xs:string">eyJhbGciOiAiUlNBLU9BRVAiLCAiZW5jIjogIkEyNTZHQ00ifQ.fmCzquqwio4B-mN5Dvm6vbcuZFp4pjK5a918YN4aJgmP4xFl_X5T71gIGCJH4VTDtGzJNj38nJTjhmx51Fqqg6wS1HOjsIeX1pUx0w1KL32Wnas13gekhM8oK-NZvmW7ulBOGUuXNMJEOyX8pbMHOeiCd4C8CDzI2M9zQ1Xve5s77f3tpTEmdR3AQ4vs5EIl3TYTVs-z9O8FWha2dx7N_qvf5FNUkZaQpZa_HxaD5cpQ2ahsAeqZxLq6gRf-fMcrmHEBlQaqbaVvtFnHEuzGzwltIFXRg_RJA7UPmg41MPhyJmG0BmWC27h1w4aCE5IXrOKji1kBTTQpfZqbHmo01g.l7h8x8_hqXZJO3t9.OFT3BQsKvEvxK-h19XNpzL7xQQi9ZFVCVlkTao3SpChXXEdo1cRyAz901vyBe-TrWOddag-ueH5JUHNOFsBNU2VQcNoATeXHoAjvg_MRQ9F2R-cRaXWINv0Uea5uBRQd-oQLg4Aq9b3JtQx6DNw1N_FGt9MFevOEqzjArlIubCCn27ccVKqmdz_MuNdftcISS98ZDt0jvXibJ4Z9MSYEaaGYWqGjbk8ON9tx1u66DP1MjIXEsCJrQbe5E9IlvHeGLW--ADEQwiqQ98iyL5BXh_eYM3o4tKumcPbOuUsp4bJcrMTyuw1jB5VlzIuUHpeE1lcdKZt1cT_K1SmiIrE0MET3ky15XhVFNm9ASo8BpvWZ4bpAKBGM8yLlz_EWdhpYYnnzwYozXERgb_AyVznUmL17I0ye0qg98miifQhefL-5PFsDh5iMzHuZI2OkktLzDn6d2XR3ltuAGu278IMpZG6cW06ZnA7WcuZsmciDy559sdTmYppjrgEM4vRBJyUYbHyrYCjVrZ3CDTiNvrdVo65H4hgr0l7TYGBvNgoFf1cRGHUMQQnQTaORkxbD4hbDTJIhN2S8-xmbnJEnqo2k8kVygndjhdZTmvJDqjOwszxXBCCDVaR82X0N_UpjoD0nNsq-HUz8DcEp7bkiE-C4Hni8ViOM5U5uwXYepKPPF3qgxXpOroTgSDTFeLV_jedEHG-q_3eM6sr7H2KBuCGNpfkM0o4qCJSpZHhyPHS_yNUkJ6KY4nSVpgLBkzv_yuOwMCXtLqopFVC9bXXmmqjXUjxKGRyg.7T81HKUbt6wrQPSeB0v9Lw</samla:AttributeValue>
-        </samla:Attribute>
-      </mdattr:EntityAttributes>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo>
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIDbjCCAtegAwIBAgIJAMzVnpW6xnXJMA0GCSqGSIb3DQEBBQUAMIGBMQswCQYD
-VQQGEwJTRTELMAkGA1UECBMCQUMxDTALBgNVBAcTBFVtZWExDDAKBgNVBAoTA0lU
-UzEMMAoGA1UECxMDRElHMRYwFAYDVQQDEw1IYW5zIEhvZXJiZXJnMSIwIAYJKoZI
-hvcNAQkBFhNoYW5zLmhvcmJlcmdAdW11LnNlMCAXDTEzMDQyNDEzMTUyOVoYDzIy
-ODcwMjA2MTMxNTI5WjCBgTELMAkGA1UEBhMCU0UxCzAJBgNVBAgTAkFDMQ0wCwYD
-VQQHEwRVbWVhMQwwCgYDVQQKEwNJVFMxDDAKBgNVBAsTA0RJRzEWMBQGA1UEAxMN
-SGFucyBIb2VyYmVyZzEiMCAGCSqGSIb3DQEJARYTaGFucy5ob3JiZXJnQHVtdS5z
-ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvvz/QurwxhDWZYarwgsk+KKw
-WxD6b1cTLTSg3A+NHE3xy2yLr4rUDmYQXNVfMYbBxuOrFRrX6gLscv6D/CXm684m
-bBJb5fE1tIdhfxWzN7GFFjWheRqxKSOI7WaclW3QKAe6WwFd+W69Qg2HFOfLAMI5
-APhsYnHtjtU696HNNBcCAwEAAaOB6TCB5jAdBgNVHQ4EFgQUeFoKo9hADNDTLyIk
-IB1jdfo6mNMwgbYGA1UdIwSBrjCBq4AUeFoKo9hADNDTLyIkIB1jdfo6mNOhgYek
-gYQwgYExCzAJBgNVBAYTAlNFMQswCQYDVQQIEwJBQzENMAsGA1UEBxMEVW1lYTEM
-MAoGA1UEChMDSVRTMQwwCgYDVQQLEwNESUcxFjAUBgNVBAMTDUhhbnMgSG9lcmJl
-cmcxIjAgBgkqhkiG9w0BCQEWE2hhbnMuaG9yYmVyZ0B1bXUuc2WCCQDM1Z6VusZ1
-yTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAI3LPS9fQ7eQMFUE1PcP
-s46Xsh+qUQiKdsYyXdAqgXrrV/ut8nmFqXyhxlqvQ5d4OLgcLYHejiqDBN0monQh
-PYMxdrL78/lzuwI47SEgp/LU8IqQWQdodaZ1yQDVvZeJ+HKuIX0dLzOaVHDLZSqE
-XUx2MauoLiNDXkEYs9GBFdgE
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo>
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIDbjCCAtegAwIBAgIJAMzVnpW6xnXJMA0GCSqGSIb3DQEBBQUAMIGBMQswCQYD
-VQQGEwJTRTELMAkGA1UECBMCQUMxDTALBgNVBAcTBFVtZWExDDAKBgNVBAoTA0lU
-UzEMMAoGA1UECxMDRElHMRYwFAYDVQQDEw1IYW5zIEhvZXJiZXJnMSIwIAYJKoZI
-hvcNAQkBFhNoYW5zLmhvcmJlcmdAdW11LnNlMCAXDTEzMDQyNDEzMTUyOVoYDzIy
-ODcwMjA2MTMxNTI5WjCBgTELMAkGA1UEBhMCU0UxCzAJBgNVBAgTAkFDMQ0wCwYD
-VQQHEwRVbWVhMQwwCgYDVQQKEwNJVFMxDDAKBgNVBAsTA0RJRzEWMBQGA1UEAxMN
-SGFucyBIb2VyYmVyZzEiMCAGCSqGSIb3DQEJARYTaGFucy5ob3JiZXJnQHVtdS5z
-ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvvz/QurwxhDWZYarwgsk+KKw
-WxD6b1cTLTSg3A+NHE3xy2yLr4rUDmYQXNVfMYbBxuOrFRrX6gLscv6D/CXm684m
-bBJb5fE1tIdhfxWzN7GFFjWheRqxKSOI7WaclW3QKAe6WwFd+W69Qg2HFOfLAMI5
-APhsYnHtjtU696HNNBcCAwEAAaOB6TCB5jAdBgNVHQ4EFgQUeFoKo9hADNDTLyIk
-IB1jdfo6mNMwgbYGA1UdIwSBrjCBq4AUeFoKo9hADNDTLyIkIB1jdfo6mNOhgYek
-gYQwgYExCzAJBgNVBAYTAlNFMQswCQYDVQQIEwJBQzENMAsGA1UEBxMEVW1lYTEM
-MAoGA1UEChMDSVRTMQwwCgYDVQQLEwNESUcxFjAUBgNVBAMTDUhhbnMgSG9lcmJl
-cmcxIjAgBgkqhkiG9w0BCQEWE2hhbnMuaG9yYmVyZ0B1bXUuc2WCCQDM1Z6VusZ1
-yTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAI3LPS9fQ7eQMFUE1PcP
-s46Xsh+qUQiKdsYyXdAqgXrrV/ut8nmFqXyhxlqvQ5d4OLgcLYHejiqDBN0monQh
-PYMxdrL78/lzuwI47SEgp/LU8IqQWQdodaZ1yQDVvZeJ+HKuIX0dLzOaVHDLZSqE
-XUx2MauoLiNDXkEYs9GBFdgE
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://hashog.umdc.umu.se:8087/slo"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://hashog.umdc.umu.se:8087" index="1"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">ITS</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="sv">ITS</ns0:OrganizationDisplayName>
-    <ns0:OrganizationDisplayName xml:lang="en">ITS</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.its.umu.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Hans</ns0:GivenName>
-    <ns0:SurName>Hoerberg</ns0:SurName>
-    <ns0:EmailAddress>hans.horberg@umu.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml b/swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml
deleted file mode 100644
index bb1b769c..00000000
--- a/swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-pd0243.its.umu.se/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SU"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/KI"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/Loginy"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/Loginx"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Utvecklarmaskin för Olov Höglund, ITS, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Development workstation for Olov Hoglund, ITS, Umea University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Utveckling av främst Servicedesk och ADFS</mdui:Description>
-        <mdui:Description xml:lang="en">Development of Servicedesk application and ADFS</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>its-pd0243.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=olov.hoglund@umu.se,CN=its-pd0243.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+zCCAuOgAwIBAgIJAO0C37kikt+EMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEeMBwGA1UEAwwVaXRzLXBkMDI0My5p
-dHMudW11LnNlMSIwIAYJKoZIhvcNAQkBFhNvbG92LmhvZ2x1bmRAdW11LnNlMB4X
-DTE0MDgyMDA2MDM1MFoXDTE3MDcwMzA2MDM1MFowgZMxCzAJBgNVBAYTAlNFMRUw
-EwYDVQQIDAxWYXN0ZXJib3R0ZW4xDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lU
-UzEMMAoGA1UECwwDSVRTMR4wHAYDVQQDDBVpdHMtcGQwMjQzLml0cy51bXUuc2Ux
-IjAgBgkqhkiG9w0BCQEWE29sb3YuaG9nbHVuZEB1bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDEJjAAtMcLWFzkaxFLzzaLuq9ofPdVV5myt33h
-+QJw2NSdZ20okuDJSqZPl1bvaDjMDpUXr0ZcJOG8yfACONCTsQ0tT7gaVsnKnZzL
-NSGAF9y0LoK3fiHfYpBE68zPidBS68i7x6fIvATUtEkm8YfbCLTTFqJ/+7ubexDg
-vHVutOBcLrWp2vuX68t6C6Ci/9+SJLLJ7MBahBQqBA+5HRB6MEPAslhUsDmUOtCN
-9HmMJLAAbNVSSDdca2uHWCyj5lQ0vQtApQ4QJEhoPm1q4FTC+abjresUzKmdRSog
-OqQNTGcAxfxiwcFhRH1Ev9h3MxdqoIKTV2ciWgBzVii0UOafAgMBAAGjUDBOMB0G
-A1UdDgQWBBQmbF7b9TbjNUQEw4YyGmGKfxB2HzAfBgNVHSMEGDAWgBQmbF7b9Tbj
-NUQEw4YyGmGKfxB2HzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA7
-SWzr3GMHqSRTaJQ++9ZpgmjcYEd3N7T1LFt1PlPy/sjpCwR4Y7BxFzjxR+4drtOs
-g8ZNYb1j1jx0OI1argiL6fHqvqfVGzihEPxdWEY83ewkZoUd+kGP5fCtRqTnjoAO
-6c22xEHvEvH2tpDeS9voRd/X+6i2pU0S2G/8fwhI5Mo81nC8I6JukdbR10Z2eldM
-H6CiTAXVx8zGKI9/1w0paMJyUVhHD+pYTebZrQd7CbZ/F5P8EhP7s8lUb5BtlCuD
-WzpbQSb/6vmdDbH3lTuWCMMrYZXYmS1QCcLVd1G2VaUhb2ThAC+6PMWQB0OggOax
-79H2Yw28W8Q9+HnLTqe2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lingon.ladok.umu.se-8087-sp.xml b/swamid-2.0/lingon.ladok.umu.se-8087-sp.xml
deleted file mode 100644
index ac182020..00000000
--- a/swamid-2.0/lingon.ladok.umu.se-8087-sp.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://lingon.ladok.umu.se:8087/sp.xml">
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lingon.ladok.umu.se:8087/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2: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=
-                    </ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2: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=
-                    </ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/ars" index="1"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/sls"/>
-    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lingon.ladok.umu.se:8087/mni"/>
-    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lingon.ladok.umu.se:8087/mni"/>
-    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/mni"/>
-    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lingon.ladok.umu.se:8087/acs/artifact"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lingon.ladok.umu.se:8087/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lingon.ladok.umu.se:8087/acs/redirect" index="2"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lingon.ladok.umu.se:8087/acs/artifact" index="3"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lingon.ladok.umu.se:8087/ecp" index="4"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="sv">Ume Universitet</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="sv">Ume Universitet
-        </ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.umu.se
-        </ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Roland</ns0:GivenName>
-    <ns0:SurName>Hedberg</ns0:SurName>
-    <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0c73cfb2..d151be73 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -40,7 +40,6 @@
   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml"/>
   <xi:include href="swamid-2.0/aktivera.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/hashog.umdc.umu.se-8087-hth.xml"/>
   <xi:include href="swamid-2.0/problem.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kilw.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/selfservice.hb.se-shibboleth.xml"/>
@@ -143,7 +142,6 @@
   <xi:include href="swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowdtest.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-test.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/lingon.ladok.umu.se-8087-sp.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
@@ -230,7 +228,6 @@
   <xi:include href="swamid-2.0/idp-test.swamid.se-r_and_s-sp.xml"/>
   <xi:include href="swamid-2.0/meta.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/samltest.swamid.se-r_and_s-sp.xml"/>
-  <xi:include href="swamid-2.0/dirg.org.umu.se-sp.xml"/>
   <xi:include href="swamid-2.0/activate-test.du.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/prep.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.alvin-portal.org-shibboleth.xml"/>
@@ -254,7 +251,6 @@
   <xi:include href="swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/webkonto.student.hig.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogon.ltu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml"/>