Removed demo-SP:s after OK from Leif.

8 files changed, 1 insertions, 462 deletions

diff --git a/scripts/remove_entity.sh b/scripts/remove_entity.sh
index ecf75bf4..0d418b45 100755
--- a/scripts/remove_entity.sh
+++ b/scripts/remove_entity.sh
@@ -7,7 +7,7 @@ fi
 metadataurl=$1
 
 if [ -s "${metadataurl}" ]; then
-	entityidfn=$metadataurl
+	entityidfn=$(basename $metadataurl)
 else
 	case $metadataurl in
 		[0-9][0-9]*)
diff --git a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml b/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
deleted file mode 100644
index 50ec0db3..00000000
--- a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://acs-ra21.mnt.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-06T12:30:23Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">ACS Publications</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ACS Publications Demo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://acs-ra21.mnt.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://acs-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://acs-ra21.mnt.se/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://acs-ra21.mnt.se/Shibboleth.sso/Login" index="3"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://acs-ra21.mnt.se/Shibboleth.sso/Login" index="4"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC9DCCAdygAwIBAgIJAPb8y+C7NO7YMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Fjcy1yYTIxLm1udC5zZTAeFw0xOTA0MDcxNTE3MjBaFw0yOTA0MDQxNTE3
-MjBaMBoxGDAWBgNVBAMTD2Fjcy1yYTIxLm1udC5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOzAOXbXzkXaOROKhQM+luFsAvM+wBz6JRH1E2ASL6VL
-JJjdWG6HqVogKWDtmt0Ckfhe+Ir/EuIdZnNJAGrM5xY3FlF/PdfZRQlulF+5YVrH
-6nb0HvMrW+ho2fCka/AEMDt6LSPCmZOpSOP2+dGA71/FJ8AfMxY1OWW51Mb5WlFN
-L7vHiUD+c5WIRvfTuFKbhEcvOo4bmGbdtbPvenc4RmQjbbTdEL1oWnvwqOmMjgmh
-WGCkI53e+l7y0HR9zmHU6aH4hA/6KqeKfIrNDFFAPW41mKE41tCd2iTfwh9j/zmQ
-1gBiM2UXAuskXhn355MmNugoGmxWuljM+GY2TDqaiWECAwEAAaM9MDswGgYDVR0R
-BBMwEYIPYWNzLXJhMjEubW50LnNlMB0GA1UdDgQWBBQkXxAbFKdn3OGY5yebbfrY
-9qP8njANBgkqhkiG9w0BAQUFAAOCAQEAYAJAwqhmraSSpHq9PDji9FR8PzCoNGkc
-jp5dgp+XNT06QSi74O1Isunoj9JGw94U9H1Q51p+m6IQeISJ2YMZQQ8XCo75Hfyp
-ZW+tn7jLSUG4sib7AlnhiS2WuwSh77uhblWdZjqPdjDTi4xVN9zLk/kJyRRSe3jt
-ieQmGMRlDjr7hTsk2fzaBakqeopccdpl89y2PCP1BQvbN1I4XV4Je++poRcLTKUS
-LAEmNeaWhO8ldUPbBtguYA7QBBgxv6sz3iOnBYhSbND6hPZeMC4nv9jpleD1UNJS
-LfzIVIx1AEnE4NLSJyoJgzDiq8xvKC04IIyrZNaVPn8+00UMkZ8Jyg==
-</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://acs-ra21.mnt.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWAMID</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml b/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
deleted file mode 100644
index 6dc75fd1..00000000
--- a/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://proquest-ra21.mnt.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-06T12:30:23Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">ProQuest</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ProQuest</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>proquest-ra21.mnt.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=proquest-ra21.mnt.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAO9nYGw3MOdqMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHByb3F1ZXN0LXJhMjEubW50LnNlMB4XDTE4MDQwNjEwMDcyNFoXDTI4MDQw
-MzEwMDcyNFowHzEdMBsGA1UEAxMUcHJvcXVlc3QtcmEyMS5tbnQuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQuEjK+SjAWaKRJhFFg07PlGBZgAxK
-0Xw+vDoNskiOTwFgIJZ6+zzVHNwbjCmPqKV79x2mGJ5RS/+xqomzE5I9wxzzbtvz
-41dlzfVpP6fE6CoyLmR1eYOSYoStSHyfUn1G11e2NkBiVRraLT9y11HgoRlvYtYH
-3J0UZOV3ewtTex0ZrB3aIoFZplXSmMpSRsblF0tALyxBr/K250T7S8iL8aQjGaD5
-Iw50dt/UBECSK5Dqo4PBRxvvXZXW6VPcQ+aX4gxHUZIsEbv9kga99cVyWXQbu6HN
-47iBswALt1ea5FOVBBC/w9FAmiRsFGy+rkfokKhPZHMDIGNzqh8fM6XBAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHByb3F1ZXN0LXJhMjEubW50LnNlMB0GA1UdDgQWBBRS
-DHIHRUA9bNdrPdSTKzAtUMHpxTANBgkqhkiG9w0BAQUFAAOCAQEAt9Jcw9BV1H+6
-DFwiiS2L1il5L+0r0F/GJZ05ae1/k/snksPaL8O4h79T0HOxMRh52ZurkyUhxbHI
-EGBJXZuYgZQQmTjta6blWJDf5rcV5oHPlioVIwDOaIUfEcmIqmS+SltIkvaJEqRM
-1wMpnPjsgpkcHYLxU6HNYtWwKENgDiseJM3TLikMn56UK+SMFlcSvaP1tKF48Xkk
-55dt2n19MMLnI03MfK6fgPgzm675hS1+NtoOcnTBNj65IE2AiItBkzzuvpSN+Wkr
-LxVQzvVDfqfV++x+RKmfyYX6SCH+cWlxHNwhx/fNYNPisA/ZK5o8rIKUOb9MZskz
-ozpzY2SFlw==
-</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://proquest-ra21.mnt.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWAMID</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml b/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
deleted file mode 100644
index f0e2f088..00000000
--- a/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rsc-ra21.mnt.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-04-07T16:51:02Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">RSC</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RSC RA21 Demo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/Login" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC9DCCAdygAwIBAgIJAKrWgX9TpWBbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3JzYy1yYTIxLm1udC5zZTAeFw0xOTA0MDcxNTE2NDhaFw0yOTA0MDQxNTE2
-NDhaMBoxGDAWBgNVBAMTD3JzYy1yYTIxLm1udC5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM+H873S6h2axCK5XadhDD9QZmxlJQEVMIn14TgfWQkj
-tPxfoMKprcU7+Y9oBbOr49d0smMQb6VuMFwKI9dP636rmhgiAuFwE7QdQ+XLJMbq
-dLt+MSCdwOn9N4PVLoSp+ZDBcUVch98BPq5gW33oohIR/pI37f3XMWYpxajER1w0
-qLL3J7wHHsP656+sV9n2Ss/Mvuz0xzhcO4CJ8s3rFxY23fgrXpwvoXYYxLficGPD
-H3cBiUMW6+Kuj/KvS3YFLryCtKA9w7JHiZXMpCfnaZbB47MNmPO2ElX6TgbsBDx2
-ELGOjEBqLsDLPrGkTuM2me3b8fKxnrsyD2LjUpfUDSsCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPcnNjLXJhMjEubW50LnNlMB0GA1UdDgQWBBR2bxjWRCD8ZVhf1V3V8nSQ
-sxrdqzANBgkqhkiG9w0BAQUFAAOCAQEAwTSQcA5gTRkH0gTjs38/18IEXwGThneL
-gaJKZ2cMPMskNtqq5oqZgZ38WRdfviPme/U+GtnZVG+nqcrhwVGMDxVwC7Qewoic
-DFp39oLAwc7RsbZVmadupfu/3+zh8vcdvHyDfUC3n7mp6fkD2+MsHlQn+30jOR4E
-6YTLa11JIQp0/Ild6y4kMFHuFIJCXTZ67lb0t+s753pLBTWA6mYF4oJkKZ66TJm3
-nXVZcr7zliBf7hM4niRuAjJMbOx8Ctt3e/d9/Ip2E1FML3sM90qUMxv0DMnsaOaG
-N9+dhbsHlWxxqoORNNMbe/1NBn7pKQIO3YhMs/XynxTRrRpS5ayjAQ==
-</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://rsc-ra21.mnt.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWAMID</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml b/swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml
deleted file mode 100644
index b8b15f2f..00000000
--- a/swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sciencedirect-ra21.mnt.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-06T12:30:23Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">ScienceDirect</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ScienceDirect</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>sciencedirect-ra21.mnt.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sciencedirect-ra21.mnt.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDEjCCAfqgAwIBAgIJAL0g1hnotfOVMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXNjaWVuY2VkaXJlY3QtcmEyMS5tbnQuc2UwHhcNMTgwNDA2MTAwNzM2WhcN
-MjgwNDAzMTAwNzM2WjAkMSIwIAYDVQQDExlzY2llbmNlZGlyZWN0LXJhMjEubW50
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6lG8s+kq6CvzwUGY
-25LA4IcerqIwtDsJZMq/OtYUS1N8XYdcpEsvlxS/m1oC2TOe/9MVK8PdvKqLbH5J
-cwIAL0JcQHfaWxQpZYCp3LyJBfIIPslnBVxd+5ks4ETXMkUHihRLA7jOjEvt7v2F
-sWjLxRsXZky/JB5nxWQWO/a8njHAJYJE6fSohk/zHj6K4ktm3OeOxhA6pItzGDHS
-CswdkC0j/NulIsEJOu5B0LrEHbbAFaOVYWm1xX6UQDsPMv3a0CuS/6oPM5daenID
-6qJ0Uoz1d2zRrHBi/ZZmxbP225Jd/v8KsZrylmXR5ogTiSQlRxD/V2XvCJKSX20I
-lfQLfwIDAQABo0cwRTAkBgNVHREEHTAbghlzY2llbmNlZGlyZWN0LXJhMjEubW50
-LnNlMB0GA1UdDgQWBBT251y98xBeLQGseEXQdvUTULDapjANBgkqhkiG9w0BAQUF
-AAOCAQEAAyD2xZGfEwSVDs8M+VslC2jhCufe0gk59FjImYzWTHlyMnOCXQEs/F8I
-HkcMUk64tr5M625Gu/iNkUo47SC1Mx8HrCHyjx4PTW5yYCegnuPiG2k2MkvHWGCT
-8t4vG1TOgwZuSbxxnTfffofmQIM4QYIaOeBAj4GuIUKJY0kTUbda1SHyzLl8ShBR
-IBZJUCw7gKqd5y+bS0/As7qkCseDWAwGcGL3KhHE6PYj+HeM7olXDbC+8SJEyO8F
-POptw7E4RHG5BoZjmuTaWqU/o7aMjlmvRpmDldjfGDJNCWEaS6ggFkwbrbFoxSQp
-yJh/Ogdw9ygHU2WVNt79W02hh9M6qw==
-</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://sciencedirect-ra21.mnt.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWAMID</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml b/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
deleted file mode 100644
index cd06ad49..00000000
--- a/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://taylor-francis-ra21.mnt.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-04-07T16:51:02Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Taylor-Francis</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Taylor Francis Demo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/Login" index="3"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFTCCAf2gAwIBAgIJAMqHb0a8ChXEMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGnRheWxvci1mcmFuY2lzLXJhMjEubW50LnNlMB4XDTE5MDQwNzE1MTc1M1oX
-DTI5MDQwNDE1MTc1M1owJTEjMCEGA1UEAxMadGF5bG9yLWZyYW5jaXMtcmEyMS5t
-bnQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDg50srcQeGodZ5
-fJkxit7UbpxWrTNXGm2Q7uhTargwh64Iz421aWWajgSzclcgmWjabpo9X2+cHyMJ
-zGB1cOQs1l4dO5mUKE8KWfuw+Xgp/XY+nf8o6i3nVIdNicDinDkYN2ljoGKiCwJK
-L4C3mnnk5FgFAYZINmygTvz92PnSUZrAhBL+hsOeJUDm3VY5jJbsB7DuDBIuBya/
-UD90PDYjkLkFd2rtFOD+AOnPerFtviabs+4nn0/M2Jo9OGYMajfWk+FAPOoUQfIb
-8crwBsDo7LefvKA8Eu1oRYcWKynEYWls4uxTtm1OabQfQ7XMM+ZvG6T/vHnwc+Wp
-KqCqlM3RAgMBAAGjSDBGMCUGA1UdEQQeMByCGnRheWxvci1mcmFuY2lzLXJhMjEu
-bW50LnNlMB0GA1UdDgQWBBQcM/yBTCESWtm6iihy3mRnk9tUczANBgkqhkiG9w0B
-AQUFAAOCAQEAjPOUDXnt+ClPY8nvqqs72fi3hRtIFDdrJxmRofnaBNj/WpSz4wVs
-htjV7XpzTlaB30Pynzx1MBLT0A7kdAMZ/qWUeWc685krOsFPX+glQQ+fdCehr6UN
-o3DPF9La+f+F//8i8esnbm92h324wxBZe/3tnb+xDUeB/u/4CpYaz1dWReRpZ3GK
-3averYb8d2/xpEYGeSUvAwNpKidPrpp9dM7XKlfsXy8ZaaAVE/kj6s2eQebKO/Al
-C/XubcCZxfY5gS02KI9MDN40PB2BqM122BK4LkZLthoSByLf36YkrxeG3QwzeLy2
-meJi/RmkoeATtUB3uah+Xax+Nx0Jil2AYw==
-</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://taylor-francis-ra21.mnt.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWAMID</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index d9462988..6864a631 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -26,11 +26,6 @@
   <xi:include href="swamid-2.0/dev-us.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/staging-us.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/us.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/acs-ra21.mnt.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.sprakochfolkminnen.se-.xml"/>
   <xi:include href="swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index c94dacee..0155a542 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -388,9 +388,6 @@
   <xi:include href="swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml"/>
-  <xi:include href="swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/acs-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/play.test.umu.se.xml"/>
   <xi:include href="swamid-2.0/portalfhs.onricoh.se-shibboleth.xml"/>
@@ -457,8 +454,6 @@
   <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
-  <xi:include href="swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/urn-auth0-safarijv-uppsala-university.xml"/>
   <xi:include href="swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml"/>