Even the IdPs of Comanage has reached EOL

6 files changed, 0 insertions, 282 deletions

diff --git a/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml b/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
deleted file mode 100644
index 68fefa11..00000000
--- a/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-test.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-02-18T13:51:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">test.sunet.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunet IdPaaS Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet IdPaaS Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testsystem för SUNETs IdPaaS</mdui:Description>
-        <mdui:Description xml:lang="en">Test system for SUNET IdPaaS</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>test.sunet.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOjCCAqKgAwIBAgIJANaoiJzHBBqYMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDgxMTQ5MzdaFw0yOTAy
-MDUxMTQ5MzdaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKygOLTdW4j7P0VslStMbK0LmD7N
-k7X6ewembu63FjcAJdko5db7ekXIBXcQbZNwSqtUavsbr0ztW5nIH+YUcl99tRTZ
-/KGSeXDe7YyERIZq6BGBi7sF00+isZYQl19SVvdfMzUiC6vebeJ3NveX4Kfj5pR6
-8iOeQukhtkR3LFR1gomp0gFWonssfPADyp3lru4UXeBF83XEfdafmxSjR16zAzHW
-KgspLjOr8uSnFD9ZjFQrqxSUA8TsqIvbM3qqXICA8UGSt0pe/i7peVcS6DRbCupU
-r1+IsSGCLxOsUmQaDQiOZp8YtZRrcljVmmevQlu7oHX6hcnK+1cyEa3nWZ+R5MQO
-nVlc+jiDlt3Ucff1auNIFI4KoWvkheVqWTdloHL2BerBPe2dduooKMZKQHPLJPb1
-dyF6kGzpxUPkklNLjU6q/SCPPa0rI+NLa16fiIeI04d7Bn2OS+6n+8obObMZwanH
-eJLuSuIe04t/bAAY4KB5UsRFLtMMd2PUInGe2wIDAQABo3cwdTBUBgNVHREETTBL
-ghppZHAtdGVzdC5jb21hbmFnZS5zdW5ldC5zZYYtaHR0cHM6Ly9pZHAtdGVzdC5j
-b21hbmFnZS5zdW5ldC5zZS9TYW1sMlNQL3NwMB0GA1UdDgQWBBRAYoG0imNLzoHO
-zDH4Caxi4XYUZzANBgkqhkiG9w0BAQsFAAOCAYEAWdnGljPC1PQbRDHdulMC1/zt
-s5ZhHgTlfe5PMydAAeLDl1p1qILh0GL4BVIrL4PBa1ROjvRHXl2rDXShlW8TRYMx
-YsfvEqbLMnyLhT6dlBUS1MPgquSIzF6wo0tDBF3X97KLtC0j2mKhvD4wezG6qhUX
-/jhoxnacuszrorgsFmARLaemx8ndqCiFJjaP+o25etG3Gfg4e4gsWVUMl12M1dMq
-y5R4oNX3ov64xc+/akXE/xZz1vOEVzaMxLBOpMHSb+zUoHk67elRP7cOKzY5wnhX
-kq/QJf//0bnCPsUVO0yGupFzwB3qHbaK7BG3JtWW1BBTKh4OvI7dRV6ivgmmWEg0
-BNC6JBhMIppOew+KNLzsPNzB5242LBdZd6v0IIR/swP8oi5qFTAe2jwpxAi8QxwE
-v1H4Us0UOyaQ0lqJz6Qz+JxzbZO90KN6TK1YLfs79zhoK1jJt73EOC8iK48dVgY8
-ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/post"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml b/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml
deleted file mode 100644
index 920a963b..00000000
--- a/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata          sstc-saml-schema-metadata-2.0.xsd          urn:mace:shibboleth:metadata:1.0          shibboleth-metadata-1.0.xsd          http://www.w3.org/2000/09/xmldsig#          xmldsig-core-schema.xsd" entityID="https://idp-test.comanage.sunet.se/Saml2SP/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-02-11T13:49:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets COmanage IDP (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet's COmanage IDP (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">COmanage IDP (test) hos Sunet</mdui:Description>
-        <mdui:Description xml:lang="en">COmanage IDP (test) at Sunet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEOjCCAqKgAwIBAgIJANaoiJzHBBqYMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDgxMTQ5MzdaFw0yOTAy
-MDUxMTQ5MzdaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKygOLTdW4j7P0VslStMbK0LmD7N
-k7X6ewembu63FjcAJdko5db7ekXIBXcQbZNwSqtUavsbr0ztW5nIH+YUcl99tRTZ
-/KGSeXDe7YyERIZq6BGBi7sF00+isZYQl19SVvdfMzUiC6vebeJ3NveX4Kfj5pR6
-8iOeQukhtkR3LFR1gomp0gFWonssfPADyp3lru4UXeBF83XEfdafmxSjR16zAzHW
-KgspLjOr8uSnFD9ZjFQrqxSUA8TsqIvbM3qqXICA8UGSt0pe/i7peVcS6DRbCupU
-r1+IsSGCLxOsUmQaDQiOZp8YtZRrcljVmmevQlu7oHX6hcnK+1cyEa3nWZ+R5MQO
-nVlc+jiDlt3Ucff1auNIFI4KoWvkheVqWTdloHL2BerBPe2dduooKMZKQHPLJPb1
-dyF6kGzpxUPkklNLjU6q/SCPPa0rI+NLa16fiIeI04d7Bn2OS+6n+8obObMZwanH
-eJLuSuIe04t/bAAY4KB5UsRFLtMMd2PUInGe2wIDAQABo3cwdTBUBgNVHREETTBL
-ghppZHAtdGVzdC5jb21hbmFnZS5zdW5ldC5zZYYtaHR0cHM6Ly9pZHAtdGVzdC5j
-b21hbmFnZS5zdW5ldC5zZS9TYW1sMlNQL3NwMB0GA1UdDgQWBBRAYoG0imNLzoHO
-zDH4Caxi4XYUZzANBgkqhkiG9w0BAQsFAAOCAYEAWdnGljPC1PQbRDHdulMC1/zt
-s5ZhHgTlfe5PMydAAeLDl1p1qILh0GL4BVIrL4PBa1ROjvRHXl2rDXShlW8TRYMx
-YsfvEqbLMnyLhT6dlBUS1MPgquSIzF6wo0tDBF3X97KLtC0j2mKhvD4wezG6qhUX
-/jhoxnacuszrorgsFmARLaemx8ndqCiFJjaP+o25etG3Gfg4e4gsWVUMl12M1dMq
-y5R4oNX3ov64xc+/akXE/xZz1vOEVzaMxLBOpMHSb+zUoHk67elRP7cOKzY5wnhX
-kq/QJf//0bnCPsUVO0yGupFzwB3qHbaK7BG3JtWW1BBTKh4OvI7dRV6ivgmmWEg0
-BNC6JBhMIppOew+KNLzsPNzB5242LBdZd6v0IIR/swP8oi5qFTAe2jwpxAi8QxwE
-v1H4Us0UOyaQ0lqJz6Qz+JxzbZO90KN6TK1YLfs79zhoK1jJt73EOC8iK48dVgY8
-ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml b/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
deleted file mode 100644
index c4ab0e45..00000000
--- a/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-19T11:24:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">test.sunet.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUNET test IdP old</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET Test IdP old</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testsystem för SUNET-anställdas inloggning</mdui:Description>
-        <mdui:Description xml:lang="en">Test system for SUNET employees login</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>test.sunet.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIENDCCApygAwIBAgIJAORi/Km/xEp8MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDcxMDI2MDlaFw0yOTAy
-MDQxMDI2MDlaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMXTvH+aNhT7qyQvQUTB89z9vHBH
-yoGMnb+NlBzyX4pwQYJMmxS1UukhLYx2IlnqAp0O09hWBEPUY5poJHOufCbI2iKz
-T2wzO+qVljr4JpWl9uc5Lqr17BhWD9y734CnY+c/5PPlzl3rQFXTkAp3zgw7vNSI
-pKYS7I9c0Eq3/v5/hV/3gnO9HFmsjwhVJ3L9dkhQNvGrf5F76+xCo2+S4u7UhwEi
-bs+nTx/tlQLGPvdqDc98vobhGo6l6flfKq8MT5/t8cu4aD+GjVIIj3DANbE9QIZ2
-0gL3b2oe+IG5r3HNG+t5s/npJs1sBALa1+pH5z44ZtRjuIX2EpuWi6taanXCVljv
-Liape7mdbSIXRAVGC0TtiR2NajRixIiYITawUfLYQR8RN+xkB+kz6HPYyXd36coq
-F7G3qOuINLAToRXJjwwa7/T8szUBlfQ2Gt7yAFrclh5OepOrkmVAPFYQNhv7ZErm
-0xai5uFMVJpG/YYhKKRMeXz+TLATjQS6EDMxRwIDAQABo3EwbzBOBgNVHREERzBF
-ghVpZHAuY29tYW5hZ2Uuc3VuZXQuc2WGLGh0dHBzOi8vaWRwLmNvbWFuYWdlLnN1
-bmV0LnNlL1NhbWwySURQL3Byb3h5MB0GA1UdDgQWBBRJ40K4lue3625hIzzY8D/R
-mMbPBzANBgkqhkiG9w0BAQsFAAOCAYEANy3nusgeK42aRJBv3Agzg/61F4kDdksP
-hz4YZK6FZXfqspC6A1+HpdZB85OcZydhjYMNbK+yj5lNUoCaad7BqpynQrwq0cN6
-7M28t+nPWEb04doB1ouVcbx8Rdc6gayO4RzqcKBlqWv/e+8sAgH3krQnIa+WcO1d
-Nplxo5mPWq0UWSuBsrv03GDbcBI1qqHnmOzaoiaGSyRQpKa9PYgZ2dtTEt57QPBq
-iiMsd6Vs43WJn3Rq1atWCyVuZxkCx6g3tWgeGRuyB5MKkX454CIbN7hzLC/sbmUS
-tGiKOy+tXB3cWkyyrPAa+3S2W4uC9XP4PXO2aHAFL3palb2Ej9FhOZ7bqC4vRE5X
-kGm/s/4IpZ/FCINKrvbroZzQlslBRvswkM+bGMFR7mFIGiJXhpBNRiXjYG2TaPMy
-oPilwb8jyQfSc/2nc5hkeMxd1RgXXsb1cz86mq+z1/yeQQE+QtrIrRX18Q5IcHRZ
-HJbyRQeO5J/RKe2busGducxQo6/KccmF
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/post"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml b/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml
deleted file mode 100644
index 2384df6c..00000000
--- a/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata          sstc-saml-schema-metadata-2.0.xsd          urn:mace:shibboleth:metadata:1.0          shibboleth-metadata-1.0.xsd          http://www.w3.org/2000/09/xmldsig#          xmldsig-core-schema.xsd" entityID="https://idp.comanage.sunet.se/Saml2SP/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-10T11:59:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets COmanage IDP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet's COmanage IDP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">COmanage IDP hos Sunet</mdui:Description>
-        <mdui:Description xml:lang="en">COmanage IDP at Sunet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIENDCCApygAwIBAgIJAORi/Km/xEp8MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDcxMDI2MDlaFw0yOTAy
-MDQxMDI2MDlaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMXTvH+aNhT7qyQvQUTB89z9vHBH
-yoGMnb+NlBzyX4pwQYJMmxS1UukhLYx2IlnqAp0O09hWBEPUY5poJHOufCbI2iKz
-T2wzO+qVljr4JpWl9uc5Lqr17BhWD9y734CnY+c/5PPlzl3rQFXTkAp3zgw7vNSI
-pKYS7I9c0Eq3/v5/hV/3gnO9HFmsjwhVJ3L9dkhQNvGrf5F76+xCo2+S4u7UhwEi
-bs+nTx/tlQLGPvdqDc98vobhGo6l6flfKq8MT5/t8cu4aD+GjVIIj3DANbE9QIZ2
-0gL3b2oe+IG5r3HNG+t5s/npJs1sBALa1+pH5z44ZtRjuIX2EpuWi6taanXCVljv
-Liape7mdbSIXRAVGC0TtiR2NajRixIiYITawUfLYQR8RN+xkB+kz6HPYyXd36coq
-F7G3qOuINLAToRXJjwwa7/T8szUBlfQ2Gt7yAFrclh5OepOrkmVAPFYQNhv7ZErm
-0xai5uFMVJpG/YYhKKRMeXz+TLATjQS6EDMxRwIDAQABo3EwbzBOBgNVHREERzBF
-ghVpZHAuY29tYW5hZ2Uuc3VuZXQuc2WGLGh0dHBzOi8vaWRwLmNvbWFuYWdlLnN1
-bmV0LnNlL1NhbWwySURQL3Byb3h5MB0GA1UdDgQWBBRJ40K4lue3625hIzzY8D/R
-mMbPBzANBgkqhkiG9w0BAQsFAAOCAYEANy3nusgeK42aRJBv3Agzg/61F4kDdksP
-hz4YZK6FZXfqspC6A1+HpdZB85OcZydhjYMNbK+yj5lNUoCaad7BqpynQrwq0cN6
-7M28t+nPWEb04doB1ouVcbx8Rdc6gayO4RzqcKBlqWv/e+8sAgH3krQnIa+WcO1d
-Nplxo5mPWq0UWSuBsrv03GDbcBI1qqHnmOzaoiaGSyRQpKa9PYgZ2dtTEt57QPBq
-iiMsd6Vs43WJn3Rq1atWCyVuZxkCx6g3tWgeGRuyB5MKkX454CIbN7hzLC/sbmUS
-tGiKOy+tXB3cWkyyrPAa+3S2W4uC9XP4PXO2aHAFL3palb2Ej9FhOZ7bqC4vRE5X
-kGm/s/4IpZ/FCINKrvbroZzQlslBRvswkM+bGMFR7mFIGiJXhpBNRiXjYG2TaPMy
-oPilwb8jyQfSc/2nc5hkeMxd1RgXXsb1cz86mq+z1/yeQQE+QtrIrRX18Q5IcHRZ
-HJbyRQeO5J/RKe2busGducxQo6/KccmF
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f634d01e..ef07af54 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -245,8 +245,6 @@
   <xi:include href="swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rt.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rt-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml"/>
-  <xi:include href="swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml"/>
   <xi:include href="swamid-2.0/test.play.rkh.se.xml"/>
   <xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.chalmers.se.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index c4557da7..d1bc74aa 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -32,8 +32,6 @@
   <xi:include href="swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml"/>
-  <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml"/>
   <xi:include href="swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/idp.test.sunet.se-idp.xml"/>