Removed non-resolvable NORDUnet hosts

9 files changed, 0 insertions, 614 deletions

diff --git a/swamid-2.0/ac-w01.nordu.net-shibboleth.xml b/swamid-2.0/ac-w01.nordu.net-shibboleth.xml
deleted file mode 100644
index 755e126f..00000000
--- a/swamid-2.0/ac-w01.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,80 +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://ac-w01.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-11-26T10:21: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://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/kalmar2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/Login/feide"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/haka.funet.fi"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/haka.funet.fi" index="5"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/Login/idp.funet.fi"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>ac-w01.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ac-w01.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAK6IEFZqeYNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFjLXcwMS5ub3JkdS5uZXQwHhcNMTUxMTI1MTQzMTMxWhcNMjUxMTIyMTQz
-MTMxWjAbMRkwFwYDVQQDExBhYy13MDEubm9yZHUubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAm5n/c1jQxsE6ZLDCaLkxAzMkYAveKeF0uMosuZAm
-LbKK88nSMRvrM4XZWUxw4Y7Hhuy4CaI2ief6DEIeCvp1zL1akcRARLKR2dcZwhaI
-Xk5ZmSk0nZFmfCx/Q1/1QkWRtlTWZN5QWjKYhMf8v6NWQUkPkzcnTn5JsFRC53XB
-ZGm4PDxbsj4iHoR+fL78gqcZ/lNlWkico8dF1Gb5ECT7RoFLwYg3j9mJegEueZCd
-zI9xK4J8D1gCv98JhMFDnUuzOsUetKI+ztzgk2kvA4UUXSg5jNQmw4CXXvR4On9F
-zuyrlB7fxfHIUW4+msGDlSIcG4D9fkpgJVggYYfogslzTQIDAQABoz4wPDAbBgNV
-HREEFDASghBhYy13MDEubm9yZHUubmV0MB0GA1UdDgQWBBTSzNfSHtoiM3DkR1ki
-UjaoX4s3KzANBgkqhkiG9w0BAQUFAAOCAQEAkKma/1Q8c9Bfhya5ZjZeVoTD/q0m
-rM+K4C7a88+bEHyIAVi5iKXrGRqcYRxiOFJ90Bqrif5Lu1kXk//WfAoijVVO7LHR
-DstraFrFHnAk+Tqz4hgN7ttzgM63hR9uEe9M5euw00UQ1MTDX2EjUtB22T9m1IPn
-A9ToIGUpGX3izWzTLU+7h2do56ZxbVwH5c+NtQAGEIqDCEbtLvAaWu4XVor8Shj7
-pdi0ryFf9fQWwe8aUhmC8BNl5KNnDMgo3ka39txGyo9bxjJHEHJDwiZNasMgHoCa
-o53aOf7QIMq0SMHnBJXRznGwibXlXP0Wtbl2hpcO5QxiZHziD434b0eYqQ==
-</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://ac-w01.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ac-w01.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ci.nordu.net-shibboleth.xml b/swamid-2.0/ci.nordu.net-shibboleth.xml
deleted file mode 100644
index a5c59843..00000000
--- a/swamid-2.0/ci.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,56 +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://ci.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-10-29T13:11: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://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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ci.nordu.net/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ci.nordu.net/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>ni.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ni.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAK2SQ9c+AOzcMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDG5pLm5vcmR1Lm5ldDAeFw0xMzAzMjIxNDMxMTBaFw0yMzAzMjAxNDMxMTBa
-MBcxFTATBgNVBAMTDG5pLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANg878PB2YXrJRpa3MqD4kMqkvw/yZfE3ze3RWoL8My8pfdQFUIE
-NTR+OH3i4Sa7yclxqKJo02z07L3wM7Fj6zmtfCvrIQ0+XDN6K++7M30iXLROvDrK
-qElF+J4wOFejy1Up+9/fFFmGn7RVMlgzGMka7ZcSasXeWRBHROA0VV5bkwdZiJDG
-LF56HH8lPvkNWyfFBCuVBeA4woZtOnm0OceK2MIgB9u0nLgWpo8146dgRj+KVnfL
-LMuD2eXAOfACXypa+FbxTHZsKBCV/E+5XFG7z+4eZx2kEczTXbpbencfppYaPBSA
-Dz75BkEtensalbDyzBybTYgbxzqrNDxwjykCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-bmkubm9yZHUubmV0MB0GA1UdDgQWBBRJI7codf8CcvUc1dW43cTlM98aZzANBgkq
-hkiG9w0BAQUFAAOCAQEAUM9s74eqkCL3C9Hh9iAVgzhdRyNJ4+Dq2zhSPIcn0rvp
-BN0Gtl8pWL/z5vLmAhhRKnJQlXrObFH1/N5FTY3iMP4ll1GGwkYs1Ne4rXkF/2Eo
-6qkaXnxW3Xo/zEsA/QHT84UVpciMV6zakrQ/xpEAegjDkYAZpenFnwlw9WxwTHAb
-YTCXdqLn6JZBIRq0O4XPDH4LLY9BDK6LhQ4o47Y8hBshp7JtqyvyDK/EtnKOijbt
-POkVsnFGi1sMSYsm3v40Wmlr75LG2M7QOOVX6JDjNHFJSFMEyncUiDjCfuqOI3Ka
-Ngx5k0w6C4avz1ua/NNuUD5WoB1mXA+YiQiIEUTnPQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ci.nordu.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ci.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ci.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ci.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ci.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ci.nordu.net/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ci.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ci.nordu.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ci.nordu.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ci.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ci.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/crowdtest.nordu.net-shibboleth.xml b/swamid-2.0/crowdtest.nordu.net-shibboleth.xml
deleted file mode 100644
index 4fc3c7d7..00000000
--- a/swamid-2.0/crowdtest.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,82 +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="http://crowdtest.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowdtest.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowdtest.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowdtest.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>crowdtest.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crowdtest.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAKWJTGBj1S7LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2Nyb3dkdGVzdC5ub3JkdS5uZXQwHhcNMTEwMjE1MTMyNzI4WhcNMjEwMjEy
-MTMyNzI4WjAeMRwwGgYDVQQDExNjcm93ZHRlc3Qubm9yZHUubmV0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlEs5rrhH2oKPjDmsh7moYJV2rI5rz4vg
-o4DaAAx4n9Ejw9SgmpNeu7D8EXn/7xf2yg/cuvmsJx1GpxSTy3N6d9YmbGwXT5B3
-5MIkHYsKEZx2uNJ1+pAOQIBIWErssnRlH5qkwKwFQBoQ9dbAi4DWdp43nHkZkdx7
-X4Sgy7Tm+oLjaF16gM4WOH4RYC1hYd/yhJD0v5Nun3FbVZ79GkJCkh+Szs8rMUWT
-YiNDO0xsLL2xtYObTtu22qbjFIU9VgQZzGuJJbLGVufr15R+cmArht2Dnsm6rmLb
-zQyFS8J+1q601uoq0s67narTLWwAzHcNW/tTLnnFHc08BIgfOR0inQIDAQABo0Ew
-PzAeBgNVHREEFzAVghNjcm93ZHRlc3Qubm9yZHUubmV0MB0GA1UdDgQWBBRp4YdO
-elj63vO7ZYFF+ovp3mNRQzANBgkqhkiG9w0BAQUFAAOCAQEALzd7eQ9U3yRB3b/0
-eBnG1DnaKAr48+EUx4anRziB41LTk3ZhmryWpJcuA737kzty3DjKjL2Trw1I3bfU
-zoaL8dYAdljdS5JAIN2m62haOrPJVublLgUw/N+72tVWVoPOBAvDvFy1WpSB8eeW
-hEEHS6yHI49FksKzRVruhdt6HeVkQ6h1y5p67AkaFoPOspI1+BCVk8fCYkHGzAkO
-6JIfKe9zwsG74AiO93x+bItRklp8d4uOXiuTOGGqwAt0Brdn/RJSUYbHfQLrVFHK
-VdA1Cg5KpGKZ7XitW5cDVgS72jJ0pb4GsYI5V0eA7/oUL9jV65LzVNGC87UjzhBA
-wOJ1sg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>crowdtest.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crowdtest.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAKWJTGBj1S7LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2Nyb3dkdGVzdC5ub3JkdS5uZXQwHhcNMTEwMjE1MTMyNzI4WhcNMjEwMjEy
-MTMyNzI4WjAeMRwwGgYDVQQDExNjcm93ZHRlc3Qubm9yZHUubmV0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlEs5rrhH2oKPjDmsh7moYJV2rI5rz4vg
-o4DaAAx4n9Ejw9SgmpNeu7D8EXn/7xf2yg/cuvmsJx1GpxSTy3N6d9YmbGwXT5B3
-5MIkHYsKEZx2uNJ1+pAOQIBIWErssnRlH5qkwKwFQBoQ9dbAi4DWdp43nHkZkdx7
-X4Sgy7Tm+oLjaF16gM4WOH4RYC1hYd/yhJD0v5Nun3FbVZ79GkJCkh+Szs8rMUWT
-YiNDO0xsLL2xtYObTtu22qbjFIU9VgQZzGuJJbLGVufr15R+cmArht2Dnsm6rmLb
-zQyFS8J+1q601uoq0s67narTLWwAzHcNW/tTLnnFHc08BIgfOR0inQIDAQABo0Ew
-PzAeBgNVHREEFzAVghNjcm93ZHRlc3Qubm9yZHUubmV0MB0GA1UdDgQWBBRp4YdO
-elj63vO7ZYFF+ovp3mNRQzANBgkqhkiG9w0BAQUFAAOCAQEALzd7eQ9U3yRB3b/0
-eBnG1DnaKAr48+EUx4anRziB41LTk3ZhmryWpJcuA737kzty3DjKjL2Trw1I3bfU
-zoaL8dYAdljdS5JAIN2m62haOrPJVublLgUw/N+72tVWVoPOBAvDvFy1WpSB8eeW
-hEEHS6yHI49FksKzRVruhdt6HeVkQ6h1y5p67AkaFoPOspI1+BCVk8fCYkHGzAkO
-6JIfKe9zwsG74AiO93x+bItRklp8d4uOXiuTOGGqwAt0Brdn/RJSUYbHfQLrVFHK
-VdA1Cg5KpGKZ7XitW5cDVgS72jJ0pb4GsYI5V0eA7/oUL9jV65LzVNGC87UjzhBA
-wOJ1sg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowdtest.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowdtest.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowdtest.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowdtest.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowdtest.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowdtest.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowdtest.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowdtest.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowdtest.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowdtest.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mds2.nordu.net-shibboleth.xml b/swamid-2.0/mds2.nordu.net-shibboleth.xml
deleted file mode 100644
index a66f9567..00000000
--- a/swamid-2.0/mds2.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,55 +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://mds2.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mds2.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mds2.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>mds2.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mds2.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDATCCAemgAwIBAgIJAIWsI++zQ8GRMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDm1kczIubm9yZHUubmV0MB4XDTEyMDgyNzE0MDAzOVoXDTIyMDgyNTE0MDAz
-OVowGTEXMBUGA1UEAxMObWRzMi5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDYdLXT/iS4dYf0L8KV8ukzZKjKUNTPv/06FdFuSMPEUFqd
-vZySTUgJy9+cCJTYZDJbTtparbef7wxOvwFsRS1jLC/QZF5e8yaF7w+gB+Jjt7A2
-OUMhDpmK0/hnNkuDz4FanqBKMH15AfC0gszeyuJoKtbI9maLiceRGsxmK5Hm5eEs
-oOf1AvUG18Nf2yNDsiLIyRTMLb9we9xaDhhbj8q0gVJRvh8GMuyyIT6RAOK63K/f
-GSj8Zass5db3E0L4gmiM5dIlNpsEGl502I0sq3JOXeyJI98g9/V3IFMBgSGNNrRh
-Xco4oulQ9YQGNCcEYvq9Jq32EO1/6M6tKpbcHqnPAgMBAAGjTDBKMCkGA1UdEQQi
-MCCCDm1kczIubm9yZHUubmV0hg5tZHMyLm5vcmR1Lm5ldDAdBgNVHQ4EFgQUVhz6
-tcOlZNHmVE5UeHHJ53CwdywwDQYJKoZIhvcNAQEFBQADggEBAJ8Id9Bb3+v4X/pq
-SVdY/tDnEXDM2FliUWn4N89SdHyis0FouFRx7mgXP3mSQ7gbCtzMjvCWRMlfZQKS
-dzs4tF3L2tcIzxJxt+7HOn1wU6YLi+MEztYLUycyC0O1HHPJQ0H/LZOjp6bz3zGj
-rj+lxSsca5Bf7TQ5wIBkux0XZVYdRG4cveYec76QHpJUn22fep0P/NXwmWIX4NLc
-UHM8iIOb55oHLBhSiOK0aD60o2nrXWllIeezlGf3fvTbiQPRmeqYMJI3ehH7Voxf
-vcJrfMS748hcrv67v1l/IGxMVfjBkQYeap9jXv4mpTUjeznioga/I1b5Fyt1xIz1
-JQ7XzWg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds2.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds2.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds2.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds2.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds2.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mds2.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mds2.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds2.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds2.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mds2.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mds2.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mds2.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mds2.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mds2.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mds2.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
deleted file mode 100644
index a05aaea0..00000000
--- a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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://meetingtools.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-14T10:29:19Z">
-      <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://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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meetingtools.nordu.net/Shibboleth.sso/DS/idp.nordu.net" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>meetingtools.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=meetingtools.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAMw0JbtsXnrGMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFm1lZXRpbmd0b29scy5ub3JkdS5uZXQwHhcNMTExMDA3MjE0MjU3WhcNMjEx
-MDA0MjE0MjU3WjAhMR8wHQYDVQQDExZtZWV0aW5ndG9vbHMubm9yZHUubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApF6eyxvsRmbALxDE1Mlxt1IV
-SY9pEr28vv1T3HDQFW0TI2SQeMQlkXmfjux0qxY3F+qI15zejcAwzhZottruFP6M
-TGTgcfC3w2H1esB2O29okFddXBtyaXWW6hVAjF1Bmgy0UwBDWWxCHo4BhXQRyIBe
-cK+hf+xgpgOdFhgC8BJERinuVtZjCRiHqyoZ9WH9/+Qd09BuGGdCXRTrmk/SO/NT
-Ncpbvyb4rLriW7xGgHScc3rdmgJnmMeXXKdMQt8q0kjbaSeibq1Z3Jqa7nDQa//1
-1VauaXNcLtiU6eTYP7vf9qLo1evQ7tkIo8PGeqX92dp4fse7lv6zVQdKlP/GiQID
-AQABo0QwQjAhBgNVHREEGjAYghZtZWV0aW5ndG9vbHMubm9yZHUubmV0MB0GA1Ud
-DgQWBBQiAOf3NZwStjuODYT1PI8wpOYO2jANBgkqhkiG9w0BAQUFAAOCAQEAasFD
-WphqHBIxJMIx1TR5LCoabp9ZM8yN7TNpmneCnhSotjNxDRhzHANKsotjRsmV80tA
-5v4yN0ORHXDjN18C1YtkaYZNGSPwEbaLWeY2MulBcgJq0nvNOxDeGhkO57u+stgY
-8Wi/UNX1X9L5TJ60AdR+jE3gVsAA7DqhKRWqSvsh6jfSwUg83A/QYIp7Qi5LfejS
-Ljjhavn6zDPLc+ILO7PDrwLBw8FD9bsff4wpngUvwQb1c1jgAy1FNGO/lK5KfX45
-asFBcvwcrKqc1WoJd5PodrX9RFw/bbIceEm5ifzg2KzsS+rWxah/RVXsXWio/nY5
-pcqH0yzoEFA0VHDdXA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>meetingtools.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=meetingtools.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAMw0JbtsXnrGMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFm1lZXRpbmd0b29scy5ub3JkdS5uZXQwHhcNMTExMDA3MjE0MjU3WhcNMjEx
-MDA0MjE0MjU3WjAhMR8wHQYDVQQDExZtZWV0aW5ndG9vbHMubm9yZHUubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApF6eyxvsRmbALxDE1Mlxt1IV
-SY9pEr28vv1T3HDQFW0TI2SQeMQlkXmfjux0qxY3F+qI15zejcAwzhZottruFP6M
-TGTgcfC3w2H1esB2O29okFddXBtyaXWW6hVAjF1Bmgy0UwBDWWxCHo4BhXQRyIBe
-cK+hf+xgpgOdFhgC8BJERinuVtZjCRiHqyoZ9WH9/+Qd09BuGGdCXRTrmk/SO/NT
-Ncpbvyb4rLriW7xGgHScc3rdmgJnmMeXXKdMQt8q0kjbaSeibq1Z3Jqa7nDQa//1
-1VauaXNcLtiU6eTYP7vf9qLo1evQ7tkIo8PGeqX92dp4fse7lv6zVQdKlP/GiQID
-AQABo0QwQjAhBgNVHREEGjAYghZtZWV0aW5ndG9vbHMubm9yZHUubmV0MB0GA1Ud
-DgQWBBQiAOf3NZwStjuODYT1PI8wpOYO2jANBgkqhkiG9w0BAQUFAAOCAQEAasFD
-WphqHBIxJMIx1TR5LCoabp9ZM8yN7TNpmneCnhSotjNxDRhzHANKsotjRsmV80tA
-5v4yN0ORHXDjN18C1YtkaYZNGSPwEbaLWeY2MulBcgJq0nvNOxDeGhkO57u+stgY
-8Wi/UNX1X9L5TJ60AdR+jE3gVsAA7DqhKRWqSvsh6jfSwUg83A/QYIp7Qi5LfejS
-Ljjhavn6zDPLc+ILO7PDrwLBw8FD9bsff4wpngUvwQb1c1jgAy1FNGO/lK5KfX45
-asFBcvwcrKqc1WoJd5PodrX9RFw/bbIceEm5ifzg2KzsS+rWxah/RVXsXWio/nY5
-pcqH0yzoEFA0VHDdXA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meetingtools.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meetingtools.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meetingtools.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetingtools.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meetingtools.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meetingtools.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meetingtools.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetingtools.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meetingtools.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meetingtools.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">NORDUnet E-Meeting Tools</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet E-Meeting Tools</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml b/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml
deleted file mode 100644
index 44ad13a6..00000000
--- a/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,80 +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://nagios-vm.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios-vm.nordu.net/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>nagios-vm.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nagios-vm.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJAOw/1rDNh+d1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE25hZ2lvcy12bS5ub3JkdS5uZXQwHhcNMTIwMTE4MTUxMTEzWhcNMjIwMTE1
-MTUxMTEzWjAeMRwwGgYDVQQDExNuYWdpb3Mtdm0ubm9yZHUubmV0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuvq7eAvCyajQnHvaHTSH1iQrejBHrBUr
-ZYkZktae1onE3oC74JwUbVQNBKu0FS0uLxdphAib923Ra3xpLmFV3cvGQrtYgxeG
-0MJOqyq8wMX5Q/2+VArKsk+BfL5XK/HdFDkZAZWSh2Se/+dgpAwo0GZuSqN64RA4
-b7uaodXO9PwLOKAVeaS522vr14mRXEG12w1D+R29+8kDW3UQHpD8/oDwXuvjS23N
-xiRxgOAI3c1khI8PuKH7mljFXG6H+KAikr9lhPo/ikFk4oh28pRtHFSzAnRem4a+
-aoSVLXXLHhjWd1mJbRPXHuQQBkNHZB1atBRvxR9gibfNpHfQTGtEMQIDAQABo1Yw
-VDAzBgNVHREELDAqghNuYWdpb3Mtdm0ubm9yZHUubmV0hhNuYWdpb3Mtdm0ubm9y
-ZHUubmV0MB0GA1UdDgQWBBSj4lzVVrzyTNgaGDhYFU4VG2YclDANBgkqhkiG9w0B
-AQUFAAOCAQEAZAlVWmvyps2vBdo86LsSj18c4ajuR14D2vAJmhLRSzjsvMjgg2dP
-pca2fCvqh1c96TiJ47lKq13cLgOSnNkL6yaNnCjSDr/qC67X9BOoZdXBQyJziWZr
-g+eF3GQzzrnvJB2/CQeT7IoyYtHeOMUgoodhiu4ABWIlkKJ5CymHGoOqDTkoibV0
-iw2iKpPj52u7wvsN0sSzQ1Gh4pf8D75dJZtAQevNRKz89wGVQUxFrgm5OEviuhIR
-5AMm/41ESEoDFvKk3RCK3JqTM6hV2s8ofGYJzGv1rK8qD78nJEsdbd0DRqgD4Iwi
-iTg/j/tOBYfIuWhX2ipi+fFwWaqmIk1LxA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>nagios-vm.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nagios-vm.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJAOw/1rDNh+d1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE25hZ2lvcy12bS5ub3JkdS5uZXQwHhcNMTIwMTE4MTUxMTEzWhcNMjIwMTE1
-MTUxMTEzWjAeMRwwGgYDVQQDExNuYWdpb3Mtdm0ubm9yZHUubmV0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuvq7eAvCyajQnHvaHTSH1iQrejBHrBUr
-ZYkZktae1onE3oC74JwUbVQNBKu0FS0uLxdphAib923Ra3xpLmFV3cvGQrtYgxeG
-0MJOqyq8wMX5Q/2+VArKsk+BfL5XK/HdFDkZAZWSh2Se/+dgpAwo0GZuSqN64RA4
-b7uaodXO9PwLOKAVeaS522vr14mRXEG12w1D+R29+8kDW3UQHpD8/oDwXuvjS23N
-xiRxgOAI3c1khI8PuKH7mljFXG6H+KAikr9lhPo/ikFk4oh28pRtHFSzAnRem4a+
-aoSVLXXLHhjWd1mJbRPXHuQQBkNHZB1atBRvxR9gibfNpHfQTGtEMQIDAQABo1Yw
-VDAzBgNVHREELDAqghNuYWdpb3Mtdm0ubm9yZHUubmV0hhNuYWdpb3Mtdm0ubm9y
-ZHUubmV0MB0GA1UdDgQWBBSj4lzVVrzyTNgaGDhYFU4VG2YclDANBgkqhkiG9w0B
-AQUFAAOCAQEAZAlVWmvyps2vBdo86LsSj18c4ajuR14D2vAJmhLRSzjsvMjgg2dP
-pca2fCvqh1c96TiJ47lKq13cLgOSnNkL6yaNnCjSDr/qC67X9BOoZdXBQyJziWZr
-g+eF3GQzzrnvJB2/CQeT7IoyYtHeOMUgoodhiu4ABWIlkKJ5CymHGoOqDTkoibV0
-iw2iKpPj52u7wvsN0sSzQ1Gh4pf8D75dJZtAQevNRKz89wGVQUxFrgm5OEviuhIR
-5AMm/41ESEoDFvKk3RCK3JqTM6hV2s8ofGYJzGv1rK8qD78nJEsdbd0DRqgD4Iwi
-iTg/j/tOBYfIuWhX2ipi+fFwWaqmIk1LxA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios-vm.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios-vm.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nagios-vm.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nordushare-dev.nordu.net-shibboleth.xml b/swamid-2.0/nordushare-dev.nordu.net-shibboleth.xml
deleted file mode 100644
index e08ce226..00000000
--- a/swamid-2.0/nordushare-dev.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,76 +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://nordushare-dev.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>nordushare-dev.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nordushare-dev.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJ5ml9hvwGGbMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGG5vcmR1c2hhcmUtZGV2Lm5vcmR1Lm5ldDAeFw0xMDAyMjYwODQyMTBaFw0y
-MDAyMjQwODQyMTBaMCMxITAfBgNVBAMTGG5vcmR1c2hhcmUtZGV2Lm5vcmR1Lm5l
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU+6XYCTSHlNgtFfmSN
-NFK7rDmwAo+OzunzZzQRHy9VmacRiREBVAa6qy/zR292HAiRg06oU0GCGlRO79pI
-6qTIVKOmDJ+seMzfGQ1E1dgAelort6BHebaifSM0iwacSuooopa0FOHE5usAfx/h
-Mx4iw0zKTZ9zZhRjO4zcxhRuyKjvXYzpYma9QrHDZhqJfy095zFfTwX7gNwk4YNI
-2XLDWDYpwJHXENjzvZ/lU0zugpz0Pe1apC4zsKMdNa3hrkHBRIk03SYJy5553Zii
-vldAxEGZKu2WCRbrh9v8KfyxABPBkzenNN7KQCHPPC5GM3M0hFrOF3es+KTm2S9G
-xPsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYbm9yZHVzaGFyZS1kZXYubm9yZHUubmV0
-MB0GA1UdDgQWBBQ6+ZPltnZEDFIC9fI8qAdsy6y4MjANBgkqhkiG9w0BAQUFAAOC
-AQEAP22l4WOyAUSmws18L3J2GJYkQ1bcpMBhS0XJCFTY+iCrFCPUeXy8EIpSCk0Y
-IWyEeZxt+wzpZnq92+zOOe7Y0WIPpvNW0Xnp/JXsnUwX3C+G8pfzZSjsDbWEUrZW
-ywCKikjjrLEKd7WNeWoiabb8uiyTey3Fn/nAJKWQTzmfAuw3E6qGjWwEKkpKorVM
-S/V9sZaU6cn4DdwUcWYM+fLdoN+guhvq3tcoFaMXqV/h5unfWoLQKv1HU8+fciVu
-ASIdGcirEZCB5YlXPAFo2DLC11SHkDvCXxZY7+lqJVwXJkPbeFHtlXMvluu9vFz8
-KaYlHoIdpaOJncFcM6QJQyZPJQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>nordushare-dev.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nordushare-dev.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJ5ml9hvwGGbMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGG5vcmR1c2hhcmUtZGV2Lm5vcmR1Lm5ldDAeFw0xMDAyMjYwODQyMTBaFw0y
-MDAyMjQwODQyMTBaMCMxITAfBgNVBAMTGG5vcmR1c2hhcmUtZGV2Lm5vcmR1Lm5l
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU+6XYCTSHlNgtFfmSN
-NFK7rDmwAo+OzunzZzQRHy9VmacRiREBVAa6qy/zR292HAiRg06oU0GCGlRO79pI
-6qTIVKOmDJ+seMzfGQ1E1dgAelort6BHebaifSM0iwacSuooopa0FOHE5usAfx/h
-Mx4iw0zKTZ9zZhRjO4zcxhRuyKjvXYzpYma9QrHDZhqJfy095zFfTwX7gNwk4YNI
-2XLDWDYpwJHXENjzvZ/lU0zugpz0Pe1apC4zsKMdNa3hrkHBRIk03SYJy5553Zii
-vldAxEGZKu2WCRbrh9v8KfyxABPBkzenNN7KQCHPPC5GM3M0hFrOF3es+KTm2S9G
-xPsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYbm9yZHVzaGFyZS1kZXYubm9yZHUubmV0
-MB0GA1UdDgQWBBQ6+ZPltnZEDFIC9fI8qAdsy6y4MjANBgkqhkiG9w0BAQUFAAOC
-AQEAP22l4WOyAUSmws18L3J2GJYkQ1bcpMBhS0XJCFTY+iCrFCPUeXy8EIpSCk0Y
-IWyEeZxt+wzpZnq92+zOOe7Y0WIPpvNW0Xnp/JXsnUwX3C+G8pfzZSjsDbWEUrZW
-ywCKikjjrLEKd7WNeWoiabb8uiyTey3Fn/nAJKWQTzmfAuw3E6qGjWwEKkpKorVM
-S/V9sZaU6cn4DdwUcWYM+fLdoN+guhvq3tcoFaMXqV/h5unfWoLQKv1HU8+fciVu
-ASIdGcirEZCB5YlXPAFo2DLC11SHkDvCXxZY7+lqJVwXJkPbeFHtlXMvluu9vFz8
-KaYlHoIdpaOJncFcM6QJQyZPJQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nordushare-dev.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/wp.nordu.net-shibboleth.xml b/swamid-2.0/wp.nordu.net-shibboleth.xml
deleted file mode 100644
index 239373df..00000000
--- a/swamid-2.0/wp.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,82 +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="http://wp.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/test-ds.nordu.net" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/test-ds.nordu.net-dj" index="2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/skolfederation" index="3"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="4"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="5"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>leifj.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=leifj.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPoZZSAmc/l2MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2xlaWZqLm5vcmR1Lm5ldDAeFw0xMjAyMjkxMzAzNDZaFw0yMjAyMjYxMzAz
-NDZaMBoxGDAWBgNVBAMTD2xlaWZqLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMIHbbT3m/6fI3EcEYK0wfEDMmb4AmLBjf1kko+a0d1s
-zdhIgeLDbBwi5v9aqS3504nAS5W25MlyYha87xghSDXLXrXHi7HLCIRUYStEiyDr
-6Isl+1ZujXEW+yaipdkTBTmg10vP3VjLgv/KNEgwwgohqsKj8Pr4NGrrdlXVgW5U
-Sj3haVm0skx2jD+8PWnF/dREOqejHeWjRvbKD6gtmoIMPM/qbl1cy6VEsRLiIifo
-iNP/fm0MlWPsEiJ9Qmp04QUD66iJ2xVrPv3nM1IKoUifRXaWdPFI4cz8Wlkm/JV9
-qNRfgVB3q7zvNmu4vJgTwzPxvmuB0fgz0o/cNmS+vKMCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbGVpZmoubm9yZHUubmV0MB0GA1UdDgQWBBTf64pGyxTkQRMjVQT2ra0N
-EyjvWjANBgkqhkiG9w0BAQUFAAOCAQEAAcmKI4qEPi+EYp6xZMNgCH5d8r8Bk1Lf
-9KgtFOV05+M4NpMKGVkDMZJbdF7fILfeI5iZoW2JzQlUkUIF9pbaicfrpAemcPET
-y8GYXkpnKS5AX+H7fyzfyt1EDStBwI4rlNw5Gfgu6LIiE7+t6+jzBYBC7xyx2dwH
-4XsJdtJuBFbz70NfV9XA84D6frNl+XXsC1ZHnwnwJXhtNIfWgLnQj0i1FMs7+bFP
-Z0TqyXKdwviYeLZbhkRQLxf82H0g5p2IY1+iR2aWOQFJwhm6sDAGBTSup0fmGxFk
-6P0RaIYawNNB2VMNAsVvyEwop4exElQK7WF/20xXETiUKWFOA8PD6Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>leifj.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=leifj.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPoZZSAmc/l2MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2xlaWZqLm5vcmR1Lm5ldDAeFw0xMjAyMjkxMzAzNDZaFw0yMjAyMjYxMzAz
-NDZaMBoxGDAWBgNVBAMTD2xlaWZqLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMIHbbT3m/6fI3EcEYK0wfEDMmb4AmLBjf1kko+a0d1s
-zdhIgeLDbBwi5v9aqS3504nAS5W25MlyYha87xghSDXLXrXHi7HLCIRUYStEiyDr
-6Isl+1ZujXEW+yaipdkTBTmg10vP3VjLgv/KNEgwwgohqsKj8Pr4NGrrdlXVgW5U
-Sj3haVm0skx2jD+8PWnF/dREOqejHeWjRvbKD6gtmoIMPM/qbl1cy6VEsRLiIifo
-iNP/fm0MlWPsEiJ9Qmp04QUD66iJ2xVrPv3nM1IKoUifRXaWdPFI4cz8Wlkm/JV9
-qNRfgVB3q7zvNmu4vJgTwzPxvmuB0fgz0o/cNmS+vKMCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbGVpZmoubm9yZHUubmV0MB0GA1UdDgQWBBTf64pGyxTkQRMjVQT2ra0N
-EyjvWjANBgkqhkiG9w0BAQUFAAOCAQEAAcmKI4qEPi+EYp6xZMNgCH5d8r8Bk1Lf
-9KgtFOV05+M4NpMKGVkDMZJbdF7fILfeI5iZoW2JzQlUkUIF9pbaicfrpAemcPET
-y8GYXkpnKS5AX+H7fyzfyt1EDStBwI4rlNw5Gfgu6LIiE7+t6+jzBYBC7xyx2dwH
-4XsJdtJuBFbz70NfV9XA84D6frNl+XXsC1ZHnwnwJXhtNIfWgLnQj0i1FMs7+bFP
-Z0TqyXKdwviYeLZbhkRQLxf82H0g5p2IY1+iR2aWOQFJwhm6sDAGBTSup0fmGxFk
-6P0RaIYawNNB2VMNAsVvyEwop4exElQK7WF/20xXETiUKWFOA8PD6Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://wp.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://wp.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://wp.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://wp.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://wp.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://wp.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://wp.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://wp.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://wp.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://wp.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://wp.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://wp.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://wp.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://wp.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://wp.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0e722771..fad6d710 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -3,7 +3,6 @@
   <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
   <xi:include href="swamid-2.0/shibboleth.turnitin.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect.funet.fi-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/wp.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box.net.xml"/>
   <xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -14,7 +13,6 @@
   <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/hades.slu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ci.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.akademiskahogtider.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
@@ -66,7 +64,6 @@
   <xi:include href="swamid-2.0/www.diva-portal.org-shibboleth.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/sp.tools.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/brainstorm.swami.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www07test.sub.su.se.xml"/>
@@ -77,16 +74,13 @@
   <xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/smd-dev.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/betafoo.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/crowdtest.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/meta2.eduroam.se.xml"/>
-  <xi:include href="swamid-2.0/meetingtools.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.sunet.se.xml"/>
   <xi:include href="swamid-2.0/mds.lan.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nagios-vm.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
   <xi:include href="swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
@@ -96,7 +90,6 @@
   <xi:include href="swamid-2.0/betafoo.nordu.net-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
-  <xi:include href="swamid-2.0/mds2.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/cdn.nordunet.tv-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml"/>
@@ -194,7 +187,6 @@
   <xi:include href="swamid-2.0/ubas.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/play.mah.se.xml"/>
-  <xi:include href="swamid-2.0/ac-w01.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/uraccess.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ludwig.lub.lu.se-sp.xml"/>