Resolves SWAMIDOPS-7069

9 files changed, 0 insertions, 567 deletions

diff --git a/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index a8a6a939..00000000
--- a/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd-test.it.su.se/Shibboleth.sso">
-  <md:Extensions>
-    <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Testimplementation av Crowd vid Stockholms universitet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Denna tjänst ger användare tillgång till test implantationen av Crowd vid Stockholms universitet.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Test implementation of Crowd at Stockholm University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">This service allows users to access the test implantation of Crowd at Stockholm University.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mino-lab02</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mino-lab02</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC5TCCAc2gAwIBAgIJAMatSzUiGYC+MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCm1pbm8tbGFiMDIwHhcNMTMwNDE5MDY0MzI5WhcNMjMwNDE3MDY0MzI5WjAV
-MRMwEQYDVQQDEwptaW5vLWxhYjAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAp+49hJCsA/5loQJX/jLCVDxHAu9yxE3Z0qoJCjLP7dw+/gPTk9l0TRIk
-QtUNEiZfDT56mi8VyW4UXuGN8/fFSSRG4gUGGqyvJxloykBjb2INT5VR4Lq4UMfm
-nEi5rPmvdU3r2p7LMWERg5t+Q7h9pmlje7hcxcg+5RkMN8ajOYEST71BIV1qw8I6
-f0yEPDDTqKDBcZbtuSDmUqT7Pn/s0alnRGW14TYliqS/jcFjr5TASxoewTj+wOR2
-2WJDlH+jl2REnLh7D24FtY8qLwFlBytv47yQ2DHbSe/upHU/T31T/t8a/XoKwUXV
-1HCcFmNn3RswrIPHVNyjku2eJhDpsQIDAQABozgwNjAVBgNVHREEDjAMggptaW5v
-LWxhYjAyMB0GA1UdDgQWBBROPqY7m/x1ubOhNpSaEFG+X6uC/TANBgkqhkiG9w0B
-AQUFAAOCAQEABLSrJnnIvhyy41FHzdK3YKjWL7FmQ0265fshjDimly4F3BD8bcW1
-UIWeHkYmoMBqe+6VQORjI8DU6IuTm39+j47ccX9wd4a8Xoghu66yAdE2LAeo5W+7
-GhqJuug/eIRbYxlRjyC/1TKQdX2HakEoo5MGZM4HKA53bU3hGUok7WJgxnNMx460
-am2vwvGH7tTbqM3brwt4FfnWG881v//OZD50A62vWwSNg6qpDAaT52+qdrZ8TSRV
-VeDKoZXj5MlQdx5DCOpkboieItTO5OUCLb/3VFWtPLi6aF2/Wfbl0aYfE5FjV0Bj
-KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mino-lab02</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mino-lab02</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC5TCCAc2gAwIBAgIJAMatSzUiGYC+MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCm1pbm8tbGFiMDIwHhcNMTMwNDE5MDY0MzI5WhcNMjMwNDE3MDY0MzI5WjAV
-MRMwEQYDVQQDEwptaW5vLWxhYjAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAp+49hJCsA/5loQJX/jLCVDxHAu9yxE3Z0qoJCjLP7dw+/gPTk9l0TRIk
-QtUNEiZfDT56mi8VyW4UXuGN8/fFSSRG4gUGGqyvJxloykBjb2INT5VR4Lq4UMfm
-nEi5rPmvdU3r2p7LMWERg5t+Q7h9pmlje7hcxcg+5RkMN8ajOYEST71BIV1qw8I6
-f0yEPDDTqKDBcZbtuSDmUqT7Pn/s0alnRGW14TYliqS/jcFjr5TASxoewTj+wOR2
-2WJDlH+jl2REnLh7D24FtY8qLwFlBytv47yQ2DHbSe/upHU/T31T/t8a/XoKwUXV
-1HCcFmNn3RswrIPHVNyjku2eJhDpsQIDAQABozgwNjAVBgNVHREEDjAMggptaW5v
-LWxhYjAyMB0GA1UdDgQWBBROPqY7m/x1ubOhNpSaEFG+X6uC/TANBgkqhkiG9w0B
-AQUFAAOCAQEABLSrJnnIvhyy41FHzdK3YKjWL7FmQ0265fshjDimly4F3BD8bcW1
-UIWeHkYmoMBqe+6VQORjI8DU6IuTm39+j47ccX9wd4a8Xoghu66yAdE2LAeo5W+7
-GhqJuug/eIRbYxlRjyC/1TKQdX2HakEoo5MGZM4HKA53bU3hGUok7WJgxnNMx460
-am2vwvGH7tTbqM3brwt4FfnWG881v//OZD50A62vWwSNg6qpDAaT52+qdrZ8TSRV
-VeDKoZXj5MlQdx5DCOpkboieItTO5OUCLb/3VFWtPLi6aF2/Wfbl0aYfE5FjV0Bj
-KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lists.su.se-shibboleth.xml b/swamid-2.0/lists.su.se-shibboleth.xml
deleted file mode 100644
index 7ef17e8c..00000000
--- a/swamid-2.0/lists.su.se-shibboleth.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.su.se/shibboleth">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIB1TCCAT6gAwIBAgIJAOsd1P/iHwDdMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2xpc3RzLnN1LnNlMB4XDTA4MDIxMjEyNTk0NVoXDTA5MDIxMTEyNTk0NVowFjEUMBIGA1UEAxMLbGlzdHMuc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALnNTH6G15SgAwQHMCa9FLJ4g/MnmZ+2Q0m8ZvXA5OKoLY+7vpH7XrojM2/ziobcPK+pE5UNaNOpVffBUFtibabgXs2N7BUDJWjcvRqk5rxmEoMd1mCRQ6WOATBPdSkZ3xFvs0yy5y+1xRNsBji7gb326dHS/WUIDAw/62dCLG5PAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAH7Ml0chViQ1GTX4RkL/S8bJpELYqTNBZ7+s7wMOwPF/TxJKeC6yFCkFKx4Ts8uGuJ3Bo3MsetTTUe24WD5aRO76k6p7y/HPs+nk0e0VJKz3NSktKGE/uXt59B/ax1tdVOMuZTGV9GwwlgHOMapYOBylI7Nriufub8Cgtwf4VwgQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml b/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 57cf2f16..00000000
--- a/swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nagios.dev.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.dev.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.dev.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>nagios-dev-srv1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nagios-dev-srv1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAKnYXsrhSwHBMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD25hZ2lvcy1kZXYtc3J2MTAeFw0xMDA4MzAxMDUyNDVaFw0yMDA4MjcxMDUy
-NDVaMBoxGDAWBgNVBAMTD25hZ2lvcy1kZXYtc3J2MTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANHbXJZ0VNMBs8zN1tZwkxHAJpxuSg/JPnOHOhuzCx0z
-xfkarAYJ4sY0QPecNo8i8kxcTSq6L36zyQom8cZKZFCYcFRnVAXuuceuQ6977gwA
-9WCbPzpSHK5qB80JO2YCIv1Va+cSNifxOQLEdvAjks9BGaDrN4xA5xW8P01BNN1S
-TZW8yj88nul0tyjQDI6Jgb4S3O0AjraiJBJxQE89evV4lq6bmmwoaTyomOMxnytQ
-IbI4kgAPPdwkyzBlodl0+NbJy2dKHbCc+UPTu3zw5Kzt21bgGvun2JU+rCCfDmuS
-Hyy2710uKDpTKPCfBwZONbiWry873xM7aKjNArgogt8CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbmFnaW9zLWRldi1zcnYxMB0GA1UdDgQWBBSVHHWbwLoIYFfcxKwLZKZo
-TYK9FTANBgkqhkiG9w0BAQUFAAOCAQEAPYN+TPc5YGPKYaoV1t6A+Bur2wAq4l/z
-ZAFZ+RpHIkqqf8GYzTYTwzSqCseA6sQ4+gWV6m4QZqDkDrBs3+bX8qKFMyPhHGF0
-B3Hv+NggykTQ91H+teU2S6HzdnzsZFKbGZPxUsxsAuLu3yC1pwbUD5z0zXmqQDL/
-Xl+dEJB7r1rZhxCqiEFltLGHy4W+FujwT6eY125zSPAcW5zRnEj/trlazPLy6xbL
-pu1WxSK20jmHhXLayahQbkim4P4KSiux7dwX1VFoG0zaBhPRFLxiCni+Jyuc8T3n
-52YI3OAimigmnolk/rjYbyszAgS+TTFzoc0yODkCWSEG0UVR1TRQow==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>nagios-dev-srv1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nagios-dev-srv1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAKnYXsrhSwHBMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD25hZ2lvcy1kZXYtc3J2MTAeFw0xMDA4MzAxMDUyNDVaFw0yMDA4MjcxMDUy
-NDVaMBoxGDAWBgNVBAMTD25hZ2lvcy1kZXYtc3J2MTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANHbXJZ0VNMBs8zN1tZwkxHAJpxuSg/JPnOHOhuzCx0z
-xfkarAYJ4sY0QPecNo8i8kxcTSq6L36zyQom8cZKZFCYcFRnVAXuuceuQ6977gwA
-9WCbPzpSHK5qB80JO2YCIv1Va+cSNifxOQLEdvAjks9BGaDrN4xA5xW8P01BNN1S
-TZW8yj88nul0tyjQDI6Jgb4S3O0AjraiJBJxQE89evV4lq6bmmwoaTyomOMxnytQ
-IbI4kgAPPdwkyzBlodl0+NbJy2dKHbCc+UPTu3zw5Kzt21bgGvun2JU+rCCfDmuS
-Hyy2710uKDpTKPCfBwZONbiWry873xM7aKjNArgogt8CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbmFnaW9zLWRldi1zcnYxMB0GA1UdDgQWBBSVHHWbwLoIYFfcxKwLZKZo
-TYK9FTANBgkqhkiG9w0BAQUFAAOCAQEAPYN+TPc5YGPKYaoV1t6A+Bur2wAq4l/z
-ZAFZ+RpHIkqqf8GYzTYTwzSqCseA6sQ4+gWV6m4QZqDkDrBs3+bX8qKFMyPhHGF0
-B3Hv+NggykTQ91H+teU2S6HzdnzsZFKbGZPxUsxsAuLu3yC1pwbUD5z0zXmqQDL/
-Xl+dEJB7r1rZhxCqiEFltLGHy4W+FujwT6eY125zSPAcW5zRnEj/trlazPLy6xbL
-pu1WxSK20jmHhXLayahQbkim4P4KSiux7dwX1VFoG0zaBhPRFLxiCni+Jyuc8T3n
-52YI3OAimigmnolk/rjYbyszAgS+TTFzoc0yODkCWSEG0UVR1TRQow==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.dev.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.dev.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.dev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 6b78cb29..00000000
--- a/swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-komm-admin.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-komm-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-komm-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAIL1xz4ljZekMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5zZTAeFw0xMDA0MTMwODExMDZaFw0y
-MDA0MTAwODExMDZaMCMxITAfBgNVBAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKb7oP0akg/pFZqs7HvD
-YH/QgeMBRF+nyF7aGwc9Fl3dqQah1VdkPP/teEr803lKrkoNcugubyO0Y9zZZuMb
-65yRcQXB0JMu3aQ+GUiSiQ5h8aQ/9D93CYrpacc7ph7VVnMctBta03dWo7zg6uTj
-DovR59k4Blmlc72cGkG24FbydYMoVo0DTAbj+EeHSB5APFx/vmz3ZTA5EBoEvGQb
-8bGby2PBPnkjW7ExcVnZbaZxR+AsjziB2lwILMd9huP7uRXo230GjqC4cAFFEfXO
-X8iCR51ekh5uNMQhDSvGhTViP+6Kkf89RaSXQ0rZgpjJymznAhZkfOuuNIWzRAqi
-udsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LWtvbW0tYWRtaW4xLml0LnN1LnNl
-MB0GA1UdDgQWBBQ58+0lsNzDRAqmUMIZRgQ0tV7IzjANBgkqhkiG9w0BAQUFAAOC
-AQEAKXaBfwubmsOke4gFS8s8M4LwFhFtxwXjN/zmLoQBvmHerCU4eT/JXm05Q6+w
-/rtF41oG8SD3Ghe/fTADARjcMnoo9gifyuofe+9GkvCBjZwSfktMGo3/0D38MfTM
-PJLds6RmW97ZOSsQMiwOZJmwF/hOxV3Wtz/EItK2vZJl9UWYF445KGPLtRkpH1uY
-MV84qSOGHth/zA9Zog4cHdal+HhqiAknQSxdXKINJIHZEQRxW0AmpzN42sHgie/N
-R12FEuHBDdtqgMbtziKhacYI87uG6/KvAHhE6bPDdmLnboviJ0/0E+CeogrT9Rju
-gWnsyGjBC5P8rFLfLiT5svPebw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-komm-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-komm-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAIL1xz4ljZekMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5zZTAeFw0xMDA0MTMwODExMDZaFw0y
-MDA0MTAwODExMDZaMCMxITAfBgNVBAMTGHBwOS1rb21tLWFkbWluMS5pdC5zdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKb7oP0akg/pFZqs7HvD
-YH/QgeMBRF+nyF7aGwc9Fl3dqQah1VdkPP/teEr803lKrkoNcugubyO0Y9zZZuMb
-65yRcQXB0JMu3aQ+GUiSiQ5h8aQ/9D93CYrpacc7ph7VVnMctBta03dWo7zg6uTj
-DovR59k4Blmlc72cGkG24FbydYMoVo0DTAbj+EeHSB5APFx/vmz3ZTA5EBoEvGQb
-8bGby2PBPnkjW7ExcVnZbaZxR+AsjziB2lwILMd9huP7uRXo230GjqC4cAFFEfXO
-X8iCR51ekh5uNMQhDSvGhTViP+6Kkf89RaSXQ0rZgpjJymznAhZkfOuuNIWzRAqi
-udsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LWtvbW0tYWRtaW4xLml0LnN1LnNl
-MB0GA1UdDgQWBBQ58+0lsNzDRAqmUMIZRgQ0tV7IzjANBgkqhkiG9w0BAQUFAAOC
-AQEAKXaBfwubmsOke4gFS8s8M4LwFhFtxwXjN/zmLoQBvmHerCU4eT/JXm05Q6+w
-/rtF41oG8SD3Ghe/fTADARjcMnoo9gifyuofe+9GkvCBjZwSfktMGo3/0D38MfTM
-PJLds6RmW97ZOSsQMiwOZJmwF/hOxV3Wtz/EItK2vZJl9UWYF445KGPLtRkpH1uY
-MV84qSOGHth/zA9Zog4cHdal+HhqiAknQSxdXKINJIHZEQRxW0AmpzN42sHgie/N
-R12FEuHBDdtqgMbtziKhacYI87uG6/KvAHhE6bPDdmLnboviJ0/0E+CeogrT9Rju
-gWnsyGjBC5P8rFLfLiT5svPebw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-komm-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index d1adc98f..00000000
--- a/swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-migr-admin.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-migr-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-migr-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJYnIHUJymP2MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDExMTUwODE3MzRaFw0y
-MDExMTIwODE3MzRaMCMxITAfBgNVBAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAlEtcytCR92E2EOJA9
-FDLkLbBVPVylwurcVOr/UohgM3tWKBkNZ/NMTPzsn4t9L3IJMDYz60d5jRHiU9Vr
-XhENl+BmdkMPig+RvdPMG43O2U5rdqFmtJXhJD3YOIu93w2amXeXCMgnVkx3HhA0
-PJzbUu1CN3HKPTv1jcTPRPfZ+7OaPhYrDWOyaqNW7Uqogb7zgYZxCBrKHeCRmIYp
-1afLj9xEdRFm1xnJrOnbimm4CpCOzPH7jddxWJuDPrJ2Ft5RNoiUCtIUdMcZmq2j
-UkTlwiWMuqOu6Wmqd9mLdoDsQ6/P4bysLKbQvt6SU8n8XrH+XGn9K5CqDLQVGmtO
-YgECAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LW1pZ3ItYWRtaW4xLml0LnN1LnNl
-MB0GA1UdDgQWBBQ2WkUmjqZ6M4McKqZFgmCGRguF9zANBgkqhkiG9w0BAQUFAAOC
-AQEAJ+lTSAJhbYDrNKKjhQtvD57/da4FUdYUGAndPM52jti7TB8/Y7ZP8EpczedN
-ZQTu8NJEGIeqiIPhnQoEzbZLxTMWdMxIZoovKHj37PBKkGaPwzsdzYP+f7yTH/4k
-yiGZE4J6ukF4BOtlf29msSylx/R/4B7hYsdix7rwXzvv0cafolTVmREl9knJC+vS
-1MB1E+ARGUpiYXzcjAa31mggc0cVpbvqpK0675jr0zxFBWWV6cNtmAucdyDYHwLj
-jttah1YP2ZgBKT3r0I5TX0xo/LpauRdGaH4YJmVzC48uBHtzC0sfDSVMa7pFVt7a
-8Ob/mCc6LzG3hOkXdqNDD0iuzA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-migr-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-migr-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJYnIHUJymP2MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDExMTUwODE3MzRaFw0y
-MDExMTIwODE3MzRaMCMxITAfBgNVBAMTGHBwOS1taWdyLWFkbWluMS5pdC5zdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAlEtcytCR92E2EOJA9
-FDLkLbBVPVylwurcVOr/UohgM3tWKBkNZ/NMTPzsn4t9L3IJMDYz60d5jRHiU9Vr
-XhENl+BmdkMPig+RvdPMG43O2U5rdqFmtJXhJD3YOIu93w2amXeXCMgnVkx3HhA0
-PJzbUu1CN3HKPTv1jcTPRPfZ+7OaPhYrDWOyaqNW7Uqogb7zgYZxCBrKHeCRmIYp
-1afLj9xEdRFm1xnJrOnbimm4CpCOzPH7jddxWJuDPrJ2Ft5RNoiUCtIUdMcZmq2j
-UkTlwiWMuqOu6Wmqd9mLdoDsQ6/P4bysLKbQvt6SU8n8XrH+XGn9K5CqDLQVGmtO
-YgECAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHA5LW1pZ3ItYWRtaW4xLml0LnN1LnNl
-MB0GA1UdDgQWBBQ2WkUmjqZ6M4McKqZFgmCGRguF9zANBgkqhkiG9w0BAQUFAAOC
-AQEAJ+lTSAJhbYDrNKKjhQtvD57/da4FUdYUGAndPM52jti7TB8/Y7ZP8EpczedN
-ZQTu8NJEGIeqiIPhnQoEzbZLxTMWdMxIZoovKHj37PBKkGaPwzsdzYP+f7yTH/4k
-yiGZE4J6ukF4BOtlf29msSylx/R/4B7hYsdix7rwXzvv0cafolTVmREl9knJC+vS
-1MB1E+ARGUpiYXzcjAa31mggc0cVpbvqpK0675jr0zxFBWWV6cNtmAucdyDYHwLj
-jttah1YP2ZgBKT3r0I5TX0xo/LpauRdGaH4YJmVzC48uBHtzC0sfDSVMa7pFVt7a
-8Ob/mCc6LzG3hOkXdqNDD0iuzA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-migr-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 46cff006..00000000
--- a/swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-redmigr-admin.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-redmigr-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-redmigr-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAPjBkccnPmL8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG3BwOS1yZWRtaWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDAzMzAxNTA5NDda
-Fw0yMDAzMjcxNTA5NDdaMCYxJDAiBgNVBAMTG3BwOS1yZWRtaWdyLWFkbWluMS5p
-dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0tKl0WTMBq
-dyKpQZ3yQmkftM0VCDayH8qLRVdwIfJQGsb4FH1JY1bBxFo7MAYyNQdVo/ZjPWgc
-uxlnLMpWNwIKq4ppKGB+tz7zJ0DnPLjVM3DZhkedKr5aMqb+GkWouWS7NefBI0Ur
-79CMk9VSNu4LtL8gkdt9Sa6ZiMhNXY7UvAjk6zYD9m6Aq2LTd2OJNemXRdTS6BJN
-KdQS/GrUN34xdWtiJpP73FB6LEZ/Zr0COAqDYjC8trfPLjHgrBlys7Vz2NtInepM
-lutsmgsCDkZmw4E7ER+rnG8p4k+QHNYyW3wuJ+IXEiD5kCwc9DPtwmU5n43OOVm2
-v9arg0mH6AUCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZG1pZ3ItYWRtaW4x
-Lml0LnN1LnNlMB0GA1UdDgQWBBRN8FcDcUnWdavUqpTCcyShocucpjANBgkqhkiG
-9w0BAQUFAAOCAQEANeuBGDI/Seh1/8M/ZDEXKEtSzZkMH2yTjpyVsq5wT8AJyRhG
-hpVqWzjRPTOjoHsBvSxdBEIcp55PonshjsKao9Ml80f4HRO0TYOyLqcEmSjE2/ja
-7BG2MBLqkTuynDbcEaElvwq/ISIi2QV4SCjEPClSromna6RlA1SfXxnD2aP8Sy/9
-dzuDa2tLHOGU23V6aKCzU+EPmMtqxKQiF+PH8aK/zW3ZrFhlslQh02ghh3sH+3n8
-tYKKiqdfhZMEf4oZur0E33RdJGW1nXbzqN4pXXS4kAzEIZoViyEz2/dy14YNrCzX
-gJIKAMgGoZsdVnA8bUktfVlibXOxBDcIRLeEgA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-redmigr-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-redmigr-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAPjBkccnPmL8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG3BwOS1yZWRtaWdyLWFkbWluMS5pdC5zdS5zZTAeFw0xMDAzMzAxNTA5NDda
-Fw0yMDAzMjcxNTA5NDdaMCYxJDAiBgNVBAMTG3BwOS1yZWRtaWdyLWFkbWluMS5p
-dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0tKl0WTMBq
-dyKpQZ3yQmkftM0VCDayH8qLRVdwIfJQGsb4FH1JY1bBxFo7MAYyNQdVo/ZjPWgc
-uxlnLMpWNwIKq4ppKGB+tz7zJ0DnPLjVM3DZhkedKr5aMqb+GkWouWS7NefBI0Ur
-79CMk9VSNu4LtL8gkdt9Sa6ZiMhNXY7UvAjk6zYD9m6Aq2LTd2OJNemXRdTS6BJN
-KdQS/GrUN34xdWtiJpP73FB6LEZ/Zr0COAqDYjC8trfPLjHgrBlys7Vz2NtInepM
-lutsmgsCDkZmw4E7ER+rnG8p4k+QHNYyW3wuJ+IXEiD5kCwc9DPtwmU5n43OOVm2
-v9arg0mH6AUCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZG1pZ3ItYWRtaW4x
-Lml0LnN1LnNlMB0GA1UdDgQWBBRN8FcDcUnWdavUqpTCcyShocucpjANBgkqhkiG
-9w0BAQUFAAOCAQEANeuBGDI/Seh1/8M/ZDEXKEtSzZkMH2yTjpyVsq5wT8AJyRhG
-hpVqWzjRPTOjoHsBvSxdBEIcp55PonshjsKao9Ml80f4HRO0TYOyLqcEmSjE2/ja
-7BG2MBLqkTuynDbcEaElvwq/ISIi2QV4SCjEPClSromna6RlA1SfXxnD2aP8Sy/9
-dzuDa2tLHOGU23V6aKCzU+EPmMtqxKQiF+PH8aK/zW3ZrFhlslQh02ghh3sH+3n8
-tYKKiqdfhZMEf4oZur0E33RdJGW1nXbzqN4pXXS4kAzEIZoViyEz2/dy14YNrCzX
-gJIKAMgGoZsdVnA8bUktfVlibXOxBDcIRLeEgA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-redmigr-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml b/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index cccf6b89..00000000
--- a/swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-redtest-admin.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-redtest-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-redtest-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAN1GOBmzBZpNMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5pdC5zdS5zZTAeFw0xMDAyMTExNTQwMTVa
-Fw0yMDAyMDkxNTQwMTVaMCYxJDAiBgNVBAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5p
-dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6wf865wqrS
-IwIxYALKc92Wi4eJNI5IRijMOYZHgzDvoBctTgQL0TG31psv422pUhfHODZDPN3O
-7m1P6YW9G8AcPm07afwibisYNLbntxa6acuAJ4TG1nfphE3YYojP7kLuS5Xbvjcg
-lqIXnnvVm+uP0uNaRK94jwoGFZ73Ljz6lkwsTJjzn5yMQFMBCmbG784ff8PkupxO
-YF3hm74tlm8zqhCzXIcmYU1fja8nXE5HwHdOnmZ+vOlgr9AighEKCxISsMVy4CDK
-l8uZBuw8LBGA75VXPTrjbQ0ZXEQ9Fk2t0LUbGqvcsEVWwNFnYFJgArkzehPcliWS
-t/Gn4WIpu+UCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZHRlc3QtYWRtaW4x
-Lml0LnN1LnNlMB0GA1UdDgQWBBRxWsX3MhdfMIRkY57kFibMC0kN7zANBgkqhkiG
-9w0BAQUFAAOCAQEAE87UBt2539lEBTHhpaoqLHcaAwXQBnVyntRVbLY7gaLdLylq
-2Z/6vF/2DA+f3DtqaHMcAJZU2x2osERliG1Uvx5HFiVnJQ+qY+i178Qp4pSsbsPz
-vE1x+TCn61NICuLUAsrjKZGUCcgeDXK01DaP6FfdnEUfhtJQ66kIzNUQW5nHerw/
-MVJeJbX7Rt6bf8LaaIH5wcZW9JeKxXJv23kCRCMMSf4OF9grlVgwrGPknbTxnMgw
-KAeYS6PTinrbpYICMGr819vwLc0UvW7U7jylSpgfROOxIEeQlIJrDGuxBJNkwkq0
-ZM0TPzxYIudNdoRwlCMbewpIpQDmj/DTPkAsKw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pp9-redtest-admin1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pp9-redtest-admin1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAN1GOBmzBZpNMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5pdC5zdS5zZTAeFw0xMDAyMTExNTQwMTVa
-Fw0yMDAyMDkxNTQwMTVaMCYxJDAiBgNVBAMTG3BwOS1yZWR0ZXN0LWFkbWluMS5p
-dC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6wf865wqrS
-IwIxYALKc92Wi4eJNI5IRijMOYZHgzDvoBctTgQL0TG31psv422pUhfHODZDPN3O
-7m1P6YW9G8AcPm07afwibisYNLbntxa6acuAJ4TG1nfphE3YYojP7kLuS5Xbvjcg
-lqIXnnvVm+uP0uNaRK94jwoGFZ73Ljz6lkwsTJjzn5yMQFMBCmbG784ff8PkupxO
-YF3hm74tlm8zqhCzXIcmYU1fja8nXE5HwHdOnmZ+vOlgr9AighEKCxISsMVy4CDK
-l8uZBuw8LBGA75VXPTrjbQ0ZXEQ9Fk2t0LUbGqvcsEVWwNFnYFJgArkzehPcliWS
-t/Gn4WIpu+UCAwEAAaNJMEcwJgYDVR0RBB8wHYIbcHA5LXJlZHRlc3QtYWRtaW4x
-Lml0LnN1LnNlMB0GA1UdDgQWBBRxWsX3MhdfMIRkY57kFibMC0kN7zANBgkqhkiG
-9w0BAQUFAAOCAQEAE87UBt2539lEBTHhpaoqLHcaAwXQBnVyntRVbLY7gaLdLylq
-2Z/6vF/2DA+f3DtqaHMcAJZU2x2osERliG1Uvx5HFiVnJQ+qY+i178Qp4pSsbsPz
-vE1x+TCn61NICuLUAsrjKZGUCcgeDXK01DaP6FfdnEUfhtJQ66kIzNUQW5nHerw/
-MVJeJbX7Rt6bf8LaaIH5wcZW9JeKxXJv23kCRCMMSf4OF9grlVgwrGPknbTxnMgw
-KAeYS6PTinrbpYICMGr819vwLc0UvW7U7jylSpgfROOxIEeQlIJrDGuxBJNkwkq0
-ZM0TPzxYIudNdoRwlCMbewpIpQDmj/DTPkAsKw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pp-redtest-admin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml b/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index ed73abca..00000000
--- a/swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt-test-app1.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>rt-test-app1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=rt-test-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAO32CkJlX+/pMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHJ0LXRlc3QtYXBwMTAeFw0xMDA3MTkxMDExNTRaFw0yMDA3MTYxMDExNTRa
-MBcxFTATBgNVBAMTDHJ0LXRlc3QtYXBwMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL130rFvSTBveOvloRg3fezPY4Phi14vff2sP9uVKijx0FKEx7DG
-RKJN6D5nZmXt4x5UzG3LetcfhjPlBu97q28RXLKDA3ICjvJwYaxtezuiYgfLogqK
-QlupoWqM9JuH0NHgkbcqjfuDrCv7dA6ONizN4rQQ//XMIx0sFw0lHgDsrBJM2tsD
-U52W0RakUuWzRxaCdq+fLpvzp3RlFrxnhGrtW6tUiXaIrJL/eyXF+MNi6XMKdo0N
-mdiEs7o4+5bsOMjT+KY1s+Dgdun2Wn9Bx9ahoV0AdNA2NUQJAmIn2w99/2Ysu4up
-NsqxE3HSrTEBjhqxYMF8LnqmC2NHDznRSTUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-cnQtdGVzdC1hcHAxMB0GA1UdDgQWBBQ6wPVxoa6YNM3Iv0a7ubYtHi4rujANBgkq
-hkiG9w0BAQUFAAOCAQEArbBt80mU0Hqg7HkeFD6Flx4feO95NvY+g2t7sUXFoVio
-kU9boN762OeaYBru7+d0aEx2iYdCuHcGXIDFMzutyqGzuRGAaPK0EqxQHZ0s5BbE
-BHTfmiFlQ8DZmsSgrHdlkYN3ZlEbtGWTE3CZDV407tuYV+/gu2JQ76K53rbpJC2C
-dYOhRYC97dn+EEhw8yHGBwdmzDXUdl7jSJUZbtXkShGgMazynH2mdaHbk4UO28Zr
-O/b1/rN0BuKDZ2rdvggEhT3YAPmEpW+qS9F06BJSJovryHCAmlvyy7pLYwscXHzd
-UNpiKN2S312lAEnoyhck4u1vFyWNvQpeW9Q0iNvykQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>rt-test-app1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=rt-test-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAO32CkJlX+/pMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHJ0LXRlc3QtYXBwMTAeFw0xMDA3MTkxMDExNTRaFw0yMDA3MTYxMDExNTRa
-MBcxFTATBgNVBAMTDHJ0LXRlc3QtYXBwMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL130rFvSTBveOvloRg3fezPY4Phi14vff2sP9uVKijx0FKEx7DG
-RKJN6D5nZmXt4x5UzG3LetcfhjPlBu97q28RXLKDA3ICjvJwYaxtezuiYgfLogqK
-QlupoWqM9JuH0NHgkbcqjfuDrCv7dA6ONizN4rQQ//XMIx0sFw0lHgDsrBJM2tsD
-U52W0RakUuWzRxaCdq+fLpvzp3RlFrxnhGrtW6tUiXaIrJL/eyXF+MNi6XMKdo0N
-mdiEs7o4+5bsOMjT+KY1s+Dgdun2Wn9Bx9ahoV0AdNA2NUQJAmIn2w99/2Ysu4up
-NsqxE3HSrTEBjhqxYMF8LnqmC2NHDznRSTUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-cnQtdGVzdC1hcHAxMB0GA1UdDgQWBBQ6wPVxoa6YNM3Iv0a7ubYtHi4rujANBgkq
-hkiG9w0BAQUFAAOCAQEArbBt80mU0Hqg7HkeFD6Flx4feO95NvY+g2t7sUXFoVio
-kU9boN762OeaYBru7+d0aEx2iYdCuHcGXIDFMzutyqGzuRGAaPK0EqxQHZ0s5BbE
-BHTfmiFlQ8DZmsSgrHdlkYN3ZlEbtGWTE3CZDV407tuYV+/gu2JQ76K53rbpJC2C
-dYOhRYC97dn+EEhw8yHGBwdmzDXUdl7jSJUZbtXkShGgMazynH2mdaHbk4UO28Zr
-O/b1/rN0BuKDZ2rdvggEhT3YAPmEpW+qS9F06BJSJovryHCAmlvyy7pLYwscXHzd
-UNpiKN2S312lAEnoyhck4u1vFyWNvQpeW9Q0iNvykQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rt-test-app1.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 23fe46e9..b72ddb3e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -46,7 +46,6 @@
   <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.mit.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/rems.csc.fi.xml"/>
-  <xi:include href="swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ugit.se-sp.xml"/>
   <xi:include href="swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml"/>
@@ -118,8 +117,6 @@
   <xi:include href="swamid-2.0/www.wisum.umdac.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.augustus.se.xml"/>
   <xi:include href="swamid-2.0/dspace.it.su.se.xml"/>
-  <xi:include href="swamid-2.0/lists.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/pp-komm-admin.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/www.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/samsok.libris.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
@@ -159,17 +156,14 @@
   <xi:include href="swamid-2.0/pp-edu-admin.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/minastudier-test.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ladok-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/pp-redtest-admin.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nordushare-dev.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/pp-migr-admin.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/pp-test-admin.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mail.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/sp.tools.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/publications.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/pp-prod-admin.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/pp-redmigr-admin.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/brainstorm.swami.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.lobber.se-shibboleth.xml"/>
@@ -182,7 +176,6 @@
   <xi:include href="swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/unitcf.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/rt-test-app1.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/jira.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
@@ -191,7 +184,6 @@
   <xi:include href="swamid-2.0/rt.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ilearn.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect.uninett.no-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nagios.dev.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/dev.lobber.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ws3.bmc.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml"/>