Comanage reached EOL

5 files changed, 0 insertions, 380 deletions

diff --git a/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml b/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml
deleted file mode 100644
index 7a027cac..00000000
--- a/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,92 +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://comanage-dev.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-17T10:56:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage-dev.sunet.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets COmanage-dev</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet's COmanage-dev</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">COmanage-dev hos Sunet</mdui:Description>
-        <mdui:Description xml:lang="en">COmanage-dev at Sunet</mdui:Description>
-      </mdui:UIInfo>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage-dev.sunet.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>3cb975108504</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>comanage-dev.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUc3/eDTvR0d7wEfjRyCyUVmNOLNUwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAxMVY29tYW5hZ2UtZGV2LnN1bmV0LnNlMB4XDTIwMDMxNTE5
-NTQwMloXDTMwMDMxMzE5NTQwMlowIDEeMBwGA1UEAxMVY29tYW5hZ2UtZGV2LnN1
-bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA2jLYt60oYVCe
-Xr/7uq27DzH7Ecv2sEXwMsi7pg35EJ2QuhWG2yNeoTofPioLuGNyb0vAK20p08Tb
-gcipGL+wwKnvFsJ9pjKmADitK09X8fD2RhjEq/b4VlXfZK9v8rIuu9g5fQWdXeqD
-EM8h0lOVH7XOOhQtj2z6w9YCCXhH5W2JQ08Z/EY+vWeTcEvvyTjVV0uDdtJMNpPd
-IBhLSe7jlfCFwxbRGAQH7/C7AdDyZR7ZuGEiiZRpYsb+ef4ftGghKgcN8I/WV8/2
-TA4fcm+bBW3X5BrhPqpWzOZ6iOxL5yMn5OEtp9WxQhxoMF70Dw599tI9AUZ9i1ew
-1ETKsgQZ3/m7/i60qoQ3RCjV6XnKPOJDR8/AvZZdjmLXIHmcjrXzuz8Vf1JqWx9I
-5bBl/LhLtOls7bgw7jb3z3XxoCfUN9JnUIWU+7BCjg43GBGNuZPaenFh3Wb+WGrz
-NGVtcphHUb54o+GOSwokVe93x7LgA2o3hylWWBl1kUx5FbCEDSQPAgMBAAGjbTBr
-MEoGA1UdEQRDMEGCFWNvbWFuYWdlLWRldi5zdW5ldC5zZYYoaHR0cHM6Ly9jb21h
-bmFnZS1kZXYuc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1IkJPOTK6mVw
-sl/RpsMpkE7UmRQwDQYJKoZIhvcNAQELBQADggGBAAcyCcC3cMCVBRsxQomMWYOP
-FbR83x/x+KaLe89ECyUB32HGKhrqbR7TkmarXD8kmEKBWMPUS99oGSkTderPMyXL
-vxhQC0qRsoAop4ix4VrXDCBqY56xZw3DNHOwe+J+lp3w42HND/tjZRsF1XVubaX7
-xdKPeV+9iic7TQIRbYiLXpPhgN7DR1NYnHR+I5fRSWJYrwjnvK7MfBh6IVrov24c
-TAYhe5QsFogQ8GWv76pBESGf5JLYfx+S0TswvFurRuPg6rHQliAYiohgInCWQNma
-PoLlxz6O5D3Mce3E5RkE/1rVjS41oBuD4T+xt7T/uCPEQC2AXupFdAKU5Xn9L8gQ
-fTfn36RSPDS1H2lb/hJ2GSnvcq58u3cEOkO+W9+PzGel/6db4yzZne6leu3ZcU+Y
-dCo0J9TAp9AF4ezsUi50VgWonSgdnutLtEZSZ9kbZJO/VAM1Zbax2NwkmejKcyTi
-T10PWaKrl44Xu5NN4+QWzR4HDFyjoJXR/7oW7l4hzQ==
-</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://comanage-dev.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </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:EntityDescriptor>
diff --git a/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml b/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
deleted file mode 100644
index bd9e4675..00000000
--- a/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://comanage-test-ds.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-05T15:04:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage-test-ds.sunet.se/Shibboleth.sso/DS/ds.sunet.se"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage-test-ds.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>comanage-test-ds.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=comanage-test-ds.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEQDCCAqigAwIBAgIJANPn4Gw2poGAMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGWNvbWFuYWdlLXRlc3QtZHMuc3VuZXQuc2UwHhcNMTkwMjA2MTIxMTEzWhcN
-MjkwMjAzMTIxMTEzWjAkMSIwIAYDVQQDExljb21hbmFnZS10ZXN0LWRzLnN1bmV0
-LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAuWmVFvUQzrFLbiv8
-1SGcOw63VeUsjfKHAvlIjN6GXCXRbo97tMRys0eTmrSdUjcYN3sF845p7BPWBVCb
-YkUzjcJnsnHwYb0JIpxHcfRJlZ9w/7xACBSYRzTfyJWBQ1hZyf3/VReGSnHfhNkX
-06ZNSdiqoOnwlLxFMgTvH33oZdGHJn8EvpN5kL13Xk/IkjVfbqrkdgcVb7181vSP
-VAMTm/df1D26BZ0sqtLnTDJ2IPs1FnsBAIKIY4coAHIcghfuNDKG2m34adYP2Jib
-CtNTtK8eC30o7gADKblkyTCXn2WGnqD65MGdc1yQjmy5705/tGBsEeFrAAlzJKZu
-Hfqs+nSAZy+4ZageCXlqiPJ4KD0po1QOjGpOVMDjGVbQ0BSTStjJ2D2cqHBbPLUq
-Fv9UpTd+4bjHJkq1emr3Oz231KpCJDPetiRuCRevu9tvJo2tpvxWN6eLjeqgswZ1
-j64qYb0zfY1uT4N84mpDAEc9jDyHPAsws7HFa5/ppgw7v0yFAgMBAAGjdTBzMFIG
-A1UdEQRLMEmCGWNvbWFuYWdlLXRlc3QtZHMuc3VuZXQuc2WGLGh0dHBzOi8vY29t
-YW5hZ2UtdGVzdC1kcy5zdW5ldC5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBS84spX
-YbqqiVUKnKflvrSYjVk99TANBgkqhkiG9w0BAQsFAAOCAYEAFA6x0xv0E93h2gKv
-wPgziB+Ny3q0X9duB+SduKxCVlB8S3igbZx+h5VRm54w3sQPsCvZ/DHYM5hKx4Fe
-xH5KyQEPFSn8+yvvuoUO7Fde/ArG6gm7+ID8kQj9cGYPSSZUlNkFN52Y+GZkRfve
-ti0m6lXtBWWTLp3iOYLb3F4qzaEaYWLXo0GnuEMefS6wUW6buedg9/Zs0CAwbv9B
-EZBwkHTIoolqUwjH6npesBP+z+zDXT+mMhSzl63UQT+NMjoOhNVBbauYnr0ze7yu
-x4dDU/TD7vOjCk/1FEuLY2WXhzLdq38fh1hC3jziRZaOlh7vcWXeynBJiueOTiPE
-8z5gKvtzaP+jYCh6+LuYhmnujmsbt8g15o9B4WStOV664bk8GU+yNpkJXyzQDhV9
-AFRf4SMRidNl7YEfkMCBRfCuTQJ18sLlISmi9xX2m13RjRgPndMo9unRVu2h0lGQ
-nafkdnWh9nd14troEWbKsEoSdP0WINxwbUpidopbZCWsFEeW
-</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://comanage-test-ds.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://comanage-test-ds.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://comanage-test-ds.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-test-ds.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-test-ds.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-test-ds.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/comanage-test.sunet.se-shibboleth.xml b/swamid-2.0/comanage-test.sunet.se-shibboleth.xml
deleted file mode 100644
index ac4db3f2..00000000
--- a/swamid-2.0/comanage-test.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,87 +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://comanage-test.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-01T16:04:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage-test.sunet.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets COmanage-test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet's COmanage-test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">COmanage-test hos Sunet</mdui:Description>
-        <mdui:Description xml:lang="en">COmanage-test at Sunet</mdui:Description>
-      </mdui:UIInfo>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage-test.sunet.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>3cb975108504</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=comanage-test.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEPzCCAqegAwIBAgIUUlezK28Unml9RFDTMuCQVo8sEiswDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWY29tYW5hZ2UtdGVzdC5zdW5ldC5zZTAeFw0yMDA1MTQx
-NTMwMjlaFw0zMDA1MTIxNTMwMjlaMCExHzAdBgNVBAMTFmNvbWFuYWdlLXRlc3Qu
-c3VuZXQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC3sNmE31tj
-O/c2FB14IStnvNlNMRxJE8HFDAFDsO2KPHxC+c7rhKgyRw6UqOoMTJ7BnM5qxaUs
-WTTUqa5gYYddH3M4Vc1Vd+7oG/IN1E2gcCUCS9GWi4R7yH5djrO8PPxxu6URXlva
-JKdWugCW7FQxpgmZn7tsRt3Q4FYlFMquGF838V6VC0KOoF95h2SNex6WRU/1L7zQ
-6KEHm4BGjJda1r9HnmrztZPy3phK6HUbsf84EUv11KsFSJUMRSFIo3RdarTqYtfj
-hPsy2Xfqin6SUBowGZTZ3kIpiU16V9ocLHWhGErr8RAov+7xQiNox45ug2/V0LbD
-CeJ97XyOOhRt/SUb8+t4M7YjO21RjTdG6VbH9BaP83Ff2Uihwf5/y04PXQZpvdvv
-DF98qZzB5SSXgpNIkgPy5LrRQdNJK6n8S7+j/IgvK6isNxkQJNgzmQggTzWH3nQy
-VzGzuNyC1ovvAcj+cnU79n8+/axO0WruJEhFVXiGE2ugKteQ+eiVyQUCAwEAAaNv
-MG0wTAYDVR0RBEUwQ4IWY29tYW5hZ2UtdGVzdC5zdW5ldC5zZYYpaHR0cHM6Ly9j
-b21hbmFnZS10ZXN0LnN1bmV0LnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFOt0b2gr
-ZPNU2zhj8p0ehSPEuIT9MA0GCSqGSIb3DQEBCwUAA4IBgQAvCV3eu1WK3YYTOp3/
-pH6pkjr1jANopl2gckZ5pxUU5gRR2KwtwYqtEnAQODgLtRlJidvACNpA+Sl+lFib
-uNru0fvu0JOFJ8nqDcFLSwK+VcyxUKMLDWXXu6fmb77McsERq+uCcaWDnHYQpTHI
-VC0dQsJ4HP+LQZhLEQPx8F1+NZFxF11m6WzyreaSYkkEk99ooyRNBMhIQeBO1MWp
-Q21hBY6RtXrSX1Ii19w3oor9npmLgJffAOjNnH/oXzUPRtmNFmgNKNPXiVDDY1px
-DdNFB+NWXMwFAdWioNKLAqWM3dBojB4cgumNyVWOIEKdaLxrc8h9cSl6GRCNn9qO
-cZbTzyxMK8WjsTGKp5kofci5DdC46pKFohcmhPX08WQjGcc85IK3y6ROYTXeiD+j
-ZUo00eWh5V7UdTEgs+5KBrNj5RBYP3wCX2i29OczkWvflcI6rm0xWg91dmujn/kn
-E66elHGyOAs9QLvMmlcRl9Km6c3N3IBT38UvyCuTOn9xgcc=
-</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://comanage-test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage-test.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/comanage.sunet.se-shibboleth.xml b/swamid-2.0/comanage.sunet.se-shibboleth.xml
deleted file mode 100644
index acc74a84..00000000
--- a/swamid-2.0/comanage.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,120 +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://comanage.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-08-10T13:11:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/nordu.net"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/nordu.net" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/kalmar2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/kalmar2" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/feide"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/haka.funet.fi"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/haka.funet.fi" index="3"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/idp.funet.fi"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/eduid-dev"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/eduid"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/unitedid"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/skolfederation"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/skolfederation" index="4"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/kalmar2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/kalmar2" index="5"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/nightly.pyff.io"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/nightly.pyff.io" index="6"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/md.nordu.net"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/md.nordu.net" index="7"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/swamid-test"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/swamid-test" index="8"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/DS/loopback"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage.sunet.se/Shibboleth.sso/DS/loopback" index="9"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/box-idp.sunet.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/box-idp.nordu.net"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/socialproxy"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/openidp"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://comanage.sunet.se/Shibboleth.sso/Login/necs.sll.se"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets COmanage (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet's COmanage (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">COmanage (test) hos Sunet</mdui:Description>
-        <mdui:Description xml:lang="en">COmanage (test) at Sunet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>comanage.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=comanage.sunet.se,O=Sunet,ST=Some-State,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbzCCA1egAwIBAgIJAKqIeDbzrXB8MA0GCSqGSIb3DQEBCwUAME4xCzAJBgNV
-BAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQKDAVTdW5ldDEaMBgG
-A1UEAwwRY29tYW5hZ2Uuc3VuZXQuc2UwHhcNMTcwODA5MDg1NzA5WhcNMjcwODA3
-MDg1NzA5WjBOMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTEOMAwG
-A1UECgwFU3VuZXQxGjAYBgNVBAMMEWNvbWFuYWdlLnN1bmV0LnNlMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmUuEG7eB3ivIuSdSa+K/Kq5PhghmsPI1
-N9GLZZ2PWlhsyaCYSkeVThDqiEfqIoKl+e6ynQ4Tt4F/2dUX0aKLF5R6HwKakLkK
-+vWStnXDGpRuYXkuZ5bp7GWQWVDs8gcRxPXDF0IPm291wMjTot8jQfj7Ev36RudG
-1hEIfwbPxFq0J7gKOWvPukkS1eJxTWQQA/lwLHfKmTPEKWGEmyAqi84BTzSlnbo4
-U6z4u8K8bs4q6uYbcuenVEL8l2lWpYF0dgLXiwUyrpYLttyIrTQRqecRhfSdwbbQ
-rOs1SzGMVIeXibWLNHCDNDrl95qJ947muhznwOToVcFNUstIbqfXWsqI+elfTl+t
-iQWOVg4o9Re+gsfUsFmKKdnU/siRxqbic6uD2959cYpaM4OENoY1z1ynGgQ1uYQD
-hTSkwRfYJjWpPrPtcCLk25/D9TmbOGI7nlB6UQrfXutNrjUiH/hkdSR6kY6X6IeP
-5LJKWBefCBolSmwJP/L1LWEGMFKHOxjMuMHW2t+HgFHmPn1mq3iCbi2juBJTsNAH
-Vy09kb9ivmuDemyS+qM+eFFOn7VzM8IOqV3MT2Bzg77g25NytTbciblhHpC06oJt
-Db9gFqWYynsw3RVOiQWolzsIHANiEQdwJnclpUMf0ukBHIV4N3K96zTmygyXFE+A
-5IMRQYZsJfUCAwEAAaNQME4wHQYDVR0OBBYEFNVoj5KNS4RQgQd84+4Tsf8R6jHC
-MB8GA1UdIwQYMBaAFNVoj5KNS4RQgQd84+4Tsf8R6jHCMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggIBAJQKfWx64TsE0AGXcobsxNjyClKx1LLcdStU80w1
-z1XhgP1kyLd7TXPfq8rU9XwUhhOXWJMmxT35WL/Pgb1m58hWb8SrnaQoM7CNczP9
-R+3D6OYa4/b8Dk3dnypV+wfej0m1qhPMX6uTcK9nWrIXGodLUX53iYZ3Uh3VfcUX
-DuR/un432RvFjOY6ZP+JRfKNNgAZDcgg9WOXOY9JfgO4QU03cIsKPQFjooVFB27d
-ibXS+VYDwJSn6NbO1XXiglGrK8m7PwX+6b/SMOHavPYxNftb5LbeNRaVHUeD9Fmc
-FK7rvaI44+o61KtiKHKfVKskjMFBbYD/ZMeXiL0SMlLDj5t14FeJSvzRvZd3FjSb
-9w12CQEXgL6S2SLHQH7q0+x+xI0WX3RwXK6BhLzZu/oJ3qxFWGbRMOx1dJ4RjTkR
-lH/ypN7ayQrz1VvRh4+VHTMA8OZdRkqdpDHi+1zlmOvRWLePqqMbkn76KLhbk8Gw
-mYMR9ZHbxCVi71Kx6n5RxYrhWRzMYxeV+4Cp8fWMoTrs5tg97TM3kYR3LnCIYPsc
-RmZKx/JkouBpRUyCSCS2rye+sO6zhUY/SVmqukyipm1/QaXIzZnn7Kwrc/rtKiWg
-fu54ZD4R2JUTIsNvjAXN85Y9owErIPLAezhWib5v2qmPox/mE57bPBjDDZpPrE9S
-kifA
-	  </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://comanage.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index fad6d710..8cf87128 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -250,10 +250,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/comanage.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/comanage-test.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/comanage-dev.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"/>