SWAMID-1649 Removed SP:s for kb.se

7 files changed, 0 insertions, 379 deletions

diff --git a/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml b/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
deleted file mode 100644
index f809e77e..00000000
--- a/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://bibliometri.swepub.kb.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-17T08:57:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SwePub</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SwePub</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SwePub för analys och bibliometri samlar vetenskapliga publikationer från svenska lärosäten och myndigheter.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kb.se/libris/swepub</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.example.se/info/about.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="100" width="100">https://bibliometri.swepub.kb.se/2.0/vendor/kungbib-styles/dist/assets/kb_logo_white.svg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="100" width="100">https://bibliometri.swepub.kb.se/2.0/vendor/kungbib-styles/dist/assets/kb_logo_white.svg</mdui:Logo>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>bibliometri.swepub.kb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bibliometri.swepub.kb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDKTCCAhGgAwIBAgIJALSn+ImlArPBMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGGJpYmxpb21ldHJpLnN3ZXB1Yi5rYi5zZTAeFw0xNjAyMTYwOTIwMzdaFw0x
-OTAyMTUwOTIwMzdaMCMxITAfBgNVBAMTGGJpYmxpb21ldHJpLnN3ZXB1Yi5rYi5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/BQW766TQFw738AlFw
-8gED1ZJfnS+uygE8NzK/S/1FH3FBKfU8anbZlVqXfNwf1HaS5r86ZIi1OP4BbDAv
-c9FZLpsnupc3QYhgyVZGi+jYWEJc3kPlajEj5hhdOtez/8/ZlJr+MIYcEm4vM3Y9
-wgvE6JOkSSXemAp/XotvXAMcz/BMcYfn9/Jr8nkZZCGWL145K73B2P/6VkeS1xrG
-5tKskeXBvsxw4pSTkzvLYc3iHFm8r2YBLc6h6ZllCxgzAUQCk+Lyu1Wu9ImPdhN/
-MINWAPYS0t5U/IUtfOW2n7eEd8gaoyuRdlY3im60buNKy6miKCDYtOCt4OAmerbP
-YLECAwEAAaNgMF4wPQYDVR0RBDYwNIIYYmlibGlvbWV0cmkuc3dlcHViLmtiLnNl
-hhhiaWJsaW9tZXRyaS5zd2VwdWIua2Iuc2UwHQYDVR0OBBYEFJagivm6oxVmwHg6
-rvhpLgSG1XX1MA0GCSqGSIb3DQEBBQUAA4IBAQAJcReLbtoOglBXv1t612ed6o3V
-YKoPLWijdlewJp0rzVJL021RZmeefar7z2pm0YKfGNdjE14Cax/p846+bZTw/k49
-VrrbTseCOOUA/fXQcnN7TRlo/N3YoMzCYckm3V0T53ff47R9KbOs0tTMvCx7SrEh
-OD+ICf8YLTkPnEr8mj/sbEyyQ+i1ZLFtMqt+V779BE0oaskv+R8tIQnKuj1XPE9d
-V+TucAkeuALHBUaMIVOg81ybHdDJTGmN5uLrmppQGSltVywFpznyyHfVMo8cBs4F
-hAZa0sY7HtDFgG7fhRkJjpHcIIidqb10OwtQqerkUmXDOXjzv6oOPV968L6N
-</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://bibliometri.swepub.kb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bibliometri.swepub.kb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/data.kb.se-shibboleth.xml b/swamid-2.0/data.kb.se-shibboleth.xml
deleted file mode 100644
index d5217da5..00000000
--- a/swamid-2.0/data.kb.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: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://data.kb.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-10-15T12:43:05Z">
-      <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#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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://data.kb.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">data.kb.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Material from the National Library of Sweden’s archive published using open standards geared towards machine readability.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="200" width="212">https://data.kb.se/static/img/kb_logo_white.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="200" width="212">https://data.kb.se/static/img/kb_logo_white.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>data01.kb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=data01.kb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAJMoGjcXFbu2MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGRhdGEwMS5rYi5zZTAeFw0xNDEwMTUwODMxMDdaFw0yNDEwMTIwODMxMDda
-MBcxFTATBgNVBAMTDGRhdGEwMS5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMgPlkvZeceYdLhkdJp3lr3qVvbApkJKeypqTbYlzq3FRAcjgAiS
-9GJeo4ED8R3TYDaSm2RtsOr/QF3gg2LoF95y+W2BQaMr7u9ukerXg0GIyk89A/P2
-lns1R4yxsrpMtqOMkCUSGNxGaYeArAaIPFXVt8sTGR2W7ns0mPdU86v+PJRYODHw
-ZFpAPamT+AzmOA+CC647SzGQU0CFJDeTH2tDM1unUKwBq1uYC+LIy02HLnTkQ63c
-a/ZYDVEUody2fT9woAU32OFDJICIHKM9YTN1Azjw6cPAQe1T02Gh/pVi+gGjoukr
-8o/24koIYvHaUR+3mmoo9KxQpeVnV7HfK8ECAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-ZGF0YTAxLmtiLnNlMB0GA1UdDgQWBBS4/mGAq6I0iFVfnhKK2EiIJ/Uq1jANBgkq
-hkiG9w0BAQUFAAOCAQEAkm6/URFMHLPcF+SA8e06Lhll9Hls7bK6JzamKNIEi2vx
-9+HjH1beRdxdG9k/ztg6EV+EZ7b8ViHYz+2wEmPLlRhqe6E2BpDptmkHcDcFpmpE
-9awVAyXe/Wm3TP8yiRzrxXc0qU7nByB5rPWau/oqFgNEinZAhNScudLi5iCo77QF
-cq+wIVt1DZVOxLNq2bFzsynJ7OQn8LQv75SvT+rrhagGah/xo+VOBq4FZ5T6kP2n
-lKwgnaX4nkxCUH27CvTAdSUIVqrmKcTNjI8MxTnHG+gxs03bk32WoMCg7tVXFOaG
-np7ZUB+s83blqas5rVEuCayjE/rRx99NwrUUzyBPGg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <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://data.kb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://data.kb.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://data.kb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://data.kb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.kb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.kb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://data.kb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://data.kb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.kb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.kb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://data.kb.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://data.kb.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.kb.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.kb.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.kb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.kb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://data.kb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://data.kb.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://data.kb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.kb.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.kb.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://data.kb.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://data.kb.se/Shibboleth.sso/SAML/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://data.kb.se/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/dev.play.smdb.kb.se.xml b/swamid-2.0/dev.play.smdb.kb.se.xml
deleted file mode 100644
index b6428ce0..00000000
--- a/swamid-2.0/dev.play.smdb.kb.se.xml
+++ /dev/null
@@ -1,51 +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://dev.play.smdb.kb.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-06-09T14:26:40Z">
-      <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket play</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Library of Sweden play</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är KBs play tjänst</mdui:Description>
-        <mdui:Description xml:lang="en">This is the National Library of Sweden's streaming service</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEVzCCAz+gAwIBAgIJAOq+2tlkBMfwMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTAeFw0xNjA2MDkwODEwMDZaFw0yNjA2MDkwODEwMDZaMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnv4zK6C1XI303zO7pi4C3318mT+W/G7Qb78uKcolubdNdI7O94bvXZpRYWtbVnEO8tP7mE5trr5OQiYA1zI9sS6pKz4LNzzcs2Q1Sbvw+IJWevwzK7HMX494v/hZkkkFRl5HaWzout0EZe/etApgbd267IdJiTYNmC6IKMR0Sks84i7rZ08FfsRWHp7OCWv+9s4tXN4h0Q2XcYLMqSY80t9Kng0oxqu67ByKGJMi6xBBDjuWSVgNDexPZrFyYNPUX28uY+3gTx5OSvMS002dJWL5yIa/xgjQ0mDm4Lc5GSk2Qrdz/cVlgSkthXpWLMlWg2c/RnTrEEeo8iYGRB7U8CAwEAAaOB3zCB3DAdBgNVHQ4EFgQUZZHmd2PBa2HcGGd3KmEVLs+KEaowgawGA1UdIwSBpDCBoYAUZZHmd2PBa2HcGGd3KmEVLs+KEaqhfqR8MHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZYIJAOq+2tlkBMfwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHhOCcoiT8M6aWts+GT5R602ZbfDXHQeBiDz1Fy8ZwQC3551UavmJ+c7NunPrhd6WWVnftRcOK12D5Y6Xu+/cH9ge1Ra0mpOjUCaznMMtTHZto6H1jkAUGIDkdEtuCgHTbsDppVvn2sH7XRZADc9idXgPX+0W+F8nN4GvYCnrC/LeKKUV+6hWDTmU4UiVRRTBiWUGV+qOAF3Rm2tLlJ5zpXG3L1KR4LBq/HzNrs7i/1kL15zDD29ok+Ovy09SHywpopB1QXNjKtL9FNROxv/DjVFyvji+zGXIkNjjqG5WfNvZcmUqg7QthSJbJcDb6mIUiYEEPF7qMgG/Zb3zpbRGEA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEVzCCAz+gAwIBAgIJAOq+2tlkBMfwMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTAeFw0xNjA2MDkwODEwMDZaFw0yNjA2MDkwODEwMDZaMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnv4zK6C1XI303zO7pi4C3318mT+W/G7Qb78uKcolubdNdI7O94bvXZpRYWtbVnEO8tP7mE5trr5OQiYA1zI9sS6pKz4LNzzcs2Q1Sbvw+IJWevwzK7HMX494v/hZkkkFRl5HaWzout0EZe/etApgbd267IdJiTYNmC6IKMR0Sks84i7rZ08FfsRWHp7OCWv+9s4tXN4h0Q2XcYLMqSY80t9Kng0oxqu67ByKGJMi6xBBDjuWSVgNDexPZrFyYNPUX28uY+3gTx5OSvMS002dJWL5yIa/xgjQ0mDm4Lc5GSk2Qrdz/cVlgSkthXpWLMlWg2c/RnTrEEeo8iYGRB7U8CAwEAAaOB3zCB3DAdBgNVHQ4EFgQUZZHmd2PBa2HcGGd3KmEVLs+KEaowgawGA1UdIwSBpDCBoYAUZZHmd2PBa2HcGGd3KmEVLs+KEaqhfqR8MHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZYIJAOq+2tlkBMfwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHhOCcoiT8M6aWts+GT5R602ZbfDXHQeBiDz1Fy8ZwQC3551UavmJ+c7NunPrhd6WWVnftRcOK12D5Y6Xu+/cH9ge1Ra0mpOjUCaznMMtTHZto6H1jkAUGIDkdEtuCgHTbsDppVvn2sH7XRZADc9idXgPX+0W+F8nN4GvYCnrC/LeKKUV+6hWDTmU4UiVRRTBiWUGV+qOAF3Rm2tLlJ5zpXG3L1KR4LBq/HzNrs7i/1kL15zDD29ok+Ovy09SHywpopB1QXNjKtL9FNROxv/DjVFyvji+zGXIkNjjqG5WfNvZcmUqg7QthSJbJcDb6mIUiYEEPF7qMgG/Zb3zpbRGEA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.play.smdb.kb.se/user/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.play.smdb.kb.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SMDB Play (DEV)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SMDB Play (DEV)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://dev.play.smdb.kb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/phid.kb.se-saml-sp.xml b/swamid-2.0/phid.kb.se-saml-sp.xml
deleted file mode 100644
index b6862101..00000000
--- a/swamid-2.0/phid.kb.se-saml-sp.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://phid.kb.se/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-17T09:08:11Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga Biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Kungliga Biblioteket</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Kungliga Biblioteket</mdui:Description>
-        <mdui:Description xml:lang="en">Kungliga Biblioteket</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIGAXxUdcuYMA0GCSqGSIb3DQEBCwUAMEIxDTALBgNVBAMMBGF1dG8xETAP
-BgNVBAsMCGN1c3RvbWVyMREwDwYDVQQKDAhQaGVuaXhJRDELMAkGA1UEBhMCU0UwHhcNMjExMDA2
-MDcxNjE4WhcNMjYxMDA1MDcxNjE4WjBCMQ0wCwYDVQQDDARhdXRvMREwDwYDVQQLDAhjdXN0b21l
-cjERMA8GA1UECgwIUGhlbml4SUQxCzAJBgNVBAYTAlNFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAoYC4Jy5qJbvADhy2JQTpjbis02Or25XBl2DWnJWS+ONnUclYJZv/51o+TOYwuvtX
-GR/Dmqvj61liB2SuZXZ7nAGd0j9FsD4ZmjS+lC2VDxOPykrM7KuUergCf78p6Sg8rWPnpKVf2cL7
-uPOKMHaf0Iatf7e0hbpvrxaFaxVv9ePq+eKxU+UCMOkUr4tN1/V0KjlIMoFbWmKaotYSVryLkVzT
-QHhalFt/INcs6GRXL3OxUmjmriOwF1YOLEXHmMS0N5bgn/9LRpRMufJDpNzvDP+TF1ApQtAobbIT
-rC5RSQFmrsNoi9ErceOjMuTJYuV0Fo+L+m/RFpxf6pIwxBQSAQIDAQABoy8wLTAOBgNVHQ8BAf8E
-BAMCBaAwGwYDVR0RBBQwEocEwQoM84IKcGhpZC5rYi5zZTANBgkqhkiG9w0BAQsFAAOCAQEAZj0j
-zkMw8tpk+S4/7OY3vRkK+CGhCup4YICsFqKS6HvnPju/RWLd493sMoMSlDp1TjaVn8asf4dHHdxk
-5JmVoQrUI9jFoc2UUDR//DvWnsX3zydykd4VMrjjTXw+JCIUQy6PQIdBoN9nA2WHTMSCrJAUrckj
-YemNMQDVnj7tuW4tj91+s7pTk3NqbEmbmQI4xEkPnPEEYyOJRkG0eHgL4gRVZlDhghFj3JZjD85G
-KuY7VwHosxj3oCFpHtAZyi96gVawvhRbgKEL+fKg+ydZhPLuFWsVGHiRZ94gHg/afBrl3h6KnPW3
-USOOI2K1p71ha4JKrQS8xUlRSw3G1vB8Yg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIGAXxUdcuYMA0GCSqGSIb3DQEBCwUAMEIxDTALBgNVBAMMBGF1dG8xETAP
-BgNVBAsMCGN1c3RvbWVyMREwDwYDVQQKDAhQaGVuaXhJRDELMAkGA1UEBhMCU0UwHhcNMjExMDA2
-MDcxNjE4WhcNMjYxMDA1MDcxNjE4WjBCMQ0wCwYDVQQDDARhdXRvMREwDwYDVQQLDAhjdXN0b21l
-cjERMA8GA1UECgwIUGhlbml4SUQxCzAJBgNVBAYTAlNFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAoYC4Jy5qJbvADhy2JQTpjbis02Or25XBl2DWnJWS+ONnUclYJZv/51o+TOYwuvtX
-GR/Dmqvj61liB2SuZXZ7nAGd0j9FsD4ZmjS+lC2VDxOPykrM7KuUergCf78p6Sg8rWPnpKVf2cL7
-uPOKMHaf0Iatf7e0hbpvrxaFaxVv9ePq+eKxU+UCMOkUr4tN1/V0KjlIMoFbWmKaotYSVryLkVzT
-QHhalFt/INcs6GRXL3OxUmjmriOwF1YOLEXHmMS0N5bgn/9LRpRMufJDpNzvDP+TF1ApQtAobbIT
-rC5RSQFmrsNoi9ErceOjMuTJYuV0Fo+L+m/RFpxf6pIwxBQSAQIDAQABoy8wLTAOBgNVHQ8BAf8E
-BAMCBaAwGwYDVR0RBBQwEocEwQoM84IKcGhpZC5rYi5zZTANBgkqhkiG9w0BAQsFAAOCAQEAZj0j
-zkMw8tpk+S4/7OY3vRkK+CGhCup4YICsFqKS6HvnPju/RWLd493sMoMSlDp1TjaVn8asf4dHHdxk
-5JmVoQrUI9jFoc2UUDR//DvWnsX3zydykd4VMrjjTXw+JCIUQy6PQIdBoN9nA2WHTMSCrJAUrckj
-YemNMQDVnj7tuW4tj91+s7pTk3NqbEmbmQI4xEkPnPEEYyOJRkG0eHgL4gRVZlDhghFj3JZjD85G
-KuY7VwHosxj3oCFpHtAZyi96gVawvhRbgKEL+fKg+ydZhPLuFWsVGHiRZ94gHg/afBrl3h6KnPW3
-USOOI2K1p71ha4JKrQS8xUlRSw3G1vB8Yg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://phid.kb.se/saml/authenticate/swamid" index="0" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Kungliga Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Kungliga Biblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Kungliga Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.kb.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.kb.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Management</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@kb.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT Operations</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@kb.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/play.smdb.kb.se.xml b/swamid-2.0/play.smdb.kb.se.xml
deleted file mode 100644
index f48d2992..00000000
--- a/swamid-2.0/play.smdb.kb.se.xml
+++ /dev/null
@@ -1,50 +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://play.smdb.kb.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-09-23T20:44:58Z">
-      <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">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket play</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Library of Sweden play</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är KBs play tjänst</mdui:Description>
-        <mdui:Description xml:lang="en">This is the National Library of Sweden's streaming service</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.smdb.kb.se/user/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.smdb.kb.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SMDB Play</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SMDB Play</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://play.smdb.kb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 7e80b91a..41899232 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -7,7 +7,6 @@
   <xi:include href="swamid-2.0/auth.asiaportal.info.xml"/>
   <xi:include href="swamid-2.0/secure.urkund.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
   <xi:include href="swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml"/>
   <xi:include href="swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/graylog.nordu.net-shibboleth.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index c8f65fda..0b1f04ef 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -93,7 +93,6 @@
   <xi:include href="swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml"/>
   <xi:include href="swamid-2.0/mfa-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/data.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
   <xi:include href="swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml"/>
   <xi:include href="swamid-2.0/service.projectplace.com-saml-metadata.xml"/>
@@ -143,7 +142,6 @@
   <xi:include href="swamid-2.0/daisy2.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.nais.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/internt.geol.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
   <xi:include href="swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ubas.lu.se-shibboleth.xml"/>
@@ -154,7 +152,6 @@
   <xi:include href="swamid-2.0/account.hh.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/keystone.lab.cloud.ipnett.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/luvit.education.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.test.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/sam.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/data.houseoffinance.se-shibboleth.xml"/>
@@ -173,7 +170,6 @@
   <xi:include href="swamid-2.0/se.timeedit.net-lu-general-sp.xml"/>
   <xi:include href="swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/id.statenssc.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/dev.play.smdb.kb.se.xml"/>
   <xi:include href="swamid-2.0/luvittest1.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/zeus.slu.se-shibboleth.xml"/>
@@ -503,7 +499,6 @@
   <xi:include href="swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml"/>
-  <xi:include href="swamid-2.0/phid.kb.se-saml-sp.xml"/>
   <xi:include href="swamid-2.0/rdi.humlab.umu.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/service4mobility.su.se-mobility_test.xml"/>
   <xi:include href="swamid-2.0/test.play.gu.se.xml"/>