SWAMID-41 Removed three old KI SPs

5 files changed, 0 insertions, 281 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 6b5ce717..625e9edb 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -98,7 +98,6 @@ play.liu.se-shibboleth.xml
 portal.mdh.se-shibboleth.xml
 portalservices.miun.se-shibboleth.xml
 portalservicesutv.miun.se-shibboleth.xml
-publications.ki.se-shibboleth.xml
 referens-idp.skolfederation.se-idp-shibboleth.xml
 samadhi.kib.ki.se-shibboleth.xml
 saml.sys.kth.se-idp-shibboleth.xml
diff --git a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
deleted file mode 100644
index 7feb16fa..00000000
--- a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,86 +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://bardo.kib.ki.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bardo.kib.ki.se/Shibboleth.sso/Login/KI"/>
-      <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://bardo.kib.ki.se/Shibboleth.sso/Login/idptest.sll.se"/>
-      <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://bardo.kib.ki.se/Shibboleth.sso/Login/idp.sll.se"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>bardo.kib.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bardo.kib.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPZjQFtVqz2PMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2JhcmRvLmtpYi5raS5zZTAeFw0xNDA3MDIxMjIyNThaFw0xOTA3MDExMjIy
-NThaMBoxGDAWBgNVBAMTD2JhcmRvLmtpYi5raS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM/QFyHedNiaN6nhhdZ2uJ1kl3p31uy1b78Iy9skeCj7
-S4uD/yOH1qVd2xu7yg97UMRflgDVuhcdOC4klMaprKW+i3Z2JLZ/dR7FXkZyy5VZ
-J+2gFkgAtHzySA/O4/3uEVt3/43uBZUI3RUN4AgBtaFRkMki+7XUDOjKk1tiOHK7
-DMmkVeOB1NBnbLYYZoulbiF272DJlobOxg67pfw5VqIbQhjYlb7/klJhQioDCjon
-4vX5EsQEr+rW/3AXX2ECiJiJmudb0OFSxmhzUVXgoBcotjx/MrDFE//zP3O4ybPq
-ktn03Gt4s2lcgc78CCdXv4l5veiQQvmxmfmcYZhh8LUCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPYmFyZG8ua2liLmtpLnNlMB0GA1UdDgQWBBTJvUGISs+SEdoa1jYpDfwt
-DBy4MjANBgkqhkiG9w0BAQUFAAOCAQEAJaDEAMprCXy6EEoM1nB+xQbFIcyUpxax
-60BnKFwmlLvbWqubyisgOmW/ZFmOi2LY8iGB2pcXzAyLp8nPu1HCp05U1TfOfGNz
-Tw9JDWmj+yHnh4TuSQuC5xs3da3Vdqb4o9GdDdNbHU/bxgrhyIQIM7JCovEgWXAo
-vJtVCWrL8e89gpMhTeTsyPBgEbTs9+2HjKfbu+dQlFlSbXMR0pYE6YTRKiMLjsVC
-lrsim9/AehfEEiDWFXGfGxYmQZdFQ/FGMiydBZsK6yBHqz0fbW9z0hJW5ZEBAlgq
-i+fNZbd6mId+n8+3g6+L2ogivB2ihvMvP1H7g1B48JzNFMpLbV3hQg==
-</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://bardo.kib.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bardo.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bardo.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bardo.kib.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bardo.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bardo.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bardo.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bardo.kib.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bardo.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bardo.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bardo.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bardo.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bardo.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bardo.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/proxytest.kib.ki.se-shibboleth.xml b/swamid-2.0/proxytest.kib.ki.se-shibboleth.xml
deleted file mode 100644
index 971734e3..00000000
--- a/swamid-2.0/proxytest.kib.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://proxytest.kib.ki.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-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 ">
-    <md:Extensions>
-      <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://login.proxytest.kib.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHRTCCBi2gAwIBAgIQASjR7b6R2dsJL3IhbDHvrzANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xOTA1MjIwMDAwMDBaFw0yMTA4MjQwMDAwMDBaMHoxCzAJBgNVBAYT
-AlNFMQ4wDAYDVQQHEwVTb2xuYTEeMBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1
-dGV0MRswGQYDVQQLExJVTklWRVJTSVRZIExJQlJBUlkxHjAcBgNVBAMMFSoucHJv
-eHl0ZXN0LmtpYi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKtt4SUmkP71SzFTbvGuJYfC16Gccjw6onKhBgyn2J1It5353sdDWir65DMU2oS9
-+IW5Y9X+SVP/MSZQBzfVnIGLRgtJ8WJusOAW84vtZpWPCuQ+iX2l0T+SIdTG+tjI
-y6HTixLeUNu53tkZXdI0KRPDJUofOBm/Zusz/zUPXcUzHOCGgl07y5ch8A8H6CDT
-a5Q5CZhoyj1cP8sBoNJjjkfBmdgO+y01HC38BixXB6Wa9EWmR78uOliRTr9Wj6Fb
-6Rtx2JXfK4Pnr1kqOJolCr9Egwslx2YjE52lZnQrBOZsbnK8gGG8DLZ3Pb6W5HqQ
-IkLGZLCiv4GIUkfJDNdvt/kCAwEAAaOCA9swggPXMB8GA1UdIwQYMBaAFGf9iCAU
-J5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBQac319STnxyoCX91X98tKhGJ5bfTA1
-BgNVHREELjAsghUqLnByb3h5dGVzdC5raWIua2kuc2WCE3Byb3h5dGVzdC5raWIu
-a2kuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20v
-VEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29t
-L1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggr
-BgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIw
-bgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2Vy
-dC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9U
-RVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwggH0BgorBgEEAdZ5AgQCBIIB
-5ASCAeAB3gB3AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABat8u
-U8EAAAQDAEgwRgIhAIjvy+XrR+pb6f6vhQIboNb69ZtubkscEmKHReKdWLsmAiEA
-xeVYjmG20mlGs7sw2tZrj/jPiw7qcUUcNJT3stasgY4AdQCHdb/nWXz4jEOZX73z
-bv9WjUdWNv9KtWDBtOr/XqCDDwAAAWrfLlSuAAAEAwBGMEQCIDN3HzqV5NN3JYbU
-7jam3h+NU2p7qR+7kLV7+15fhPotAiA6K364ebj1VNE4BUuPIWjsog0NWvtnodYB
-5dn4UW1VNQB1AESUZS6w7s6vxEAH2Kj+KMDa5oK+2MsxtT/TM5a1toGoAAABat8u
-UzQAAAQDAEYwRAIgVUEk3hEAAQrX+hs1P519tzvelZ6NIQsKOa42Ylvx0BQCIAXh
-lsFn3trEEba5Ev9dGvx5aF+hoUYh4LtxkuVAQsSgAHUAVhQGmi/XwuzT9eG9RLI+
-x0Z2ubyZEVzA75SYVdaJ0N0AAAFq3y5UTQAABAMARjBEAiBwfDlCgKS5z1jhFRGs
-8w7CXNfLFkgoa3DAIuhCcowm7QIgbxy2Hibrzv3ar2Q6SevWY1FK1hG1tgWlZg9V
-FKNg97cwDQYJKoZIhvcNAQELBQADggEBAETaDdPFbXPvIktMg8DFuqdGUijOAgAq
-YCXO3d31qwwdhSknJxWOM5Em2CfXKZR9Nthq3AUwJCeTYZXd9YcjkxbgjHb0wbvn
-PuWLPQMzuPBVBAFUjkow0s8gMax7hB2JpByRfN0bNAQC1aHmLTGQIHSa/5VBO4Vn
-ZT67aouI7EF6o10Y4HQ0sdtGPZz7S6QKpa9Yt8ukJmxLwux2jb6lIc+6ZBqNbPy5
-0VnliRx9FILFN+sNOMlDpDkFaKdsr+sAlHDAV/cbf5xHXwGc5d7vvzXO4sRZYuiI
-4DxHTRL+9bKV2mE2v5NPE00FVGXqGk6DJxfXK2GT23hTtq5o5yZigVI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.proxytest.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.proxytest.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.proxytest.kib.ki.se/Shibboleth.sso/SAML/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.proxytest.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Johan Finn</md:SurName>
-    <md:EmailAddress>mailto:johan.finn@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/publications.ki.se-shibboleth.xml b/swamid-2.0/publications.ki.se-shibboleth.xml
deleted file mode 100644
index d15576c7..00000000
--- a/swamid-2.0/publications.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,117 +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://publications.ki.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet Universitetsbiblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet University Library</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SWAMID Identitetsleverantör för Karolinska Institutet Universitetsbiblioteket.</mdui:Description>
-        <mdui:Description xml:lang="en">SWAMID Identity Provider for Karolinska Institutet University Library.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://kib.ki.se/om-webbplatsen</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://kib.ki.se/en/about-website</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>publications.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ubitdos@kib.ki.se,CN=publications.ki.se,OU=UNIVERSITY LIBRARY,O=Karolinska Institutet,L=Solna,ST=Some-State,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIJAOQykWZUCZpqMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTEOMAwGA1UEBxMFU29sbmExHjAc
-BgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRldDEbMBkGA1UECxMSVU5JVkVSU0lU
-WSBMSUJSQVJZMRswGQYDVQQDExJwdWJsaWNhdGlvbnMua2kuc2UxIDAeBgkqhkiG
-9w0BCQEWEXViaXRkb3NAa2liLmtpLnNlMB4XDTEwMDMyMzE1MzQ0OFoXDTIwMDMy
-MDE1MzQ0OFowga4xCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4w
-DAYDVQQHEwVTb2xuYTEeMBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MRsw
-GQYDVQQLExJVTklWRVJTSVRZIExJQlJBUlkxGzAZBgNVBAMTEnB1YmxpY2F0aW9u
-cy5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0BraWIua2kuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC11ax7K5PjR3GFpvzT37OKa1ycH3Rt
-z0GNApRMQtS7x9q1wgRjA3dqdTSIIJettkBgyEUOfB0f1MgcaMtaNIPhDJfMCqdr
-Q6dPKp+F0b7P7jWezyWNt8gVKXSOaeJYjze56zURO+MK8CA4sTpttqgcOOv5pnhN
-wyEuYmQBYtKGvcH13jJPStsQ+s5LZ9NX/5gV64DrRI4s64d9r0FH78lHzkM2TqHI
-0ce2KeZdn3AgXy1tOW58nUKVlUNgsFZyg/GH0ICZ08tOo1YHWBu1iuZQrzfKI655
-j8R4gElSbT+Sp770OoC9qgoBsQQdh3N/Pj+/RvgSTMG3cOmtIlNu/YjpAgMBAAGj
-ggEXMIIBEzAdBgNVHQ4EFgQUjs01iDGc22yXqpCThMLfgM12WCAwgeMGA1UdIwSB
-2zCB2IAUjs01iDGc22yXqpCThMLfgM12WCChgbSkgbEwga4xCzAJBgNVBAYTAlNF
-MRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4wDAYDVQQHEwVTb2xuYTEeMBwGA1UEChMV
-S2Fyb2xpbnNrYSBJbnN0aXR1dGV0MRswGQYDVQQLExJVTklWRVJTSVRZIExJQlJB
-UlkxGzAZBgNVBAMTEnB1YmxpY2F0aW9ucy5raS5zZTEgMB4GCSqGSIb3DQEJARYR
-dWJpdGRvc0BraWIua2kuc2WCCQDkMpFmVAmaajAMBgNVHRMEBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQBcI4P5JLCJuTCKie7Ze/NucF3tBgcXllnSYo7z4NSafr0i
-CrsoBPoxg1Sr7cFXSCRWLUr7Di2WfdQLrn3ZY1sPTYKWlgEmWVYFiSph2HYv04L9
-I72Jn8DLvaNCqew7KYgCODkSFRUFxzGDlWho0cXHMwP31/dEVEa2mUwmMEzG+ScQ
-DII+Op9QBwqJ7VgT7RLwhH6txbcicwNdfQYktXy/C7ysmUAS6XW1vE3H3LDd6Oc5
-98OMIxMcebzCxLN0jT93KgoWEq2eaGQi0h4TPZ7ZGmCkVQICVvSNjEKguACD/j9o
-ryntMn54coBlF2Vqrm4Fa2XUyUIkurCv3FZtdN5W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>publications.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ubitdos@kib.ki.se,CN=publications.ki.se,OU=UNIVERSITY LIBRARY,O=Karolinska Institutet,L=Solna,ST=Some-State,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIJAOQykWZUCZpqMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTEOMAwGA1UEBxMFU29sbmExHjAc
-BgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRldDEbMBkGA1UECxMSVU5JVkVSU0lU
-WSBMSUJSQVJZMRswGQYDVQQDExJwdWJsaWNhdGlvbnMua2kuc2UxIDAeBgkqhkiG
-9w0BCQEWEXViaXRkb3NAa2liLmtpLnNlMB4XDTEwMDMyMzE1MzQ0OFoXDTIwMDMy
-MDE1MzQ0OFowga4xCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4w
-DAYDVQQHEwVTb2xuYTEeMBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MRsw
-GQYDVQQLExJVTklWRVJTSVRZIExJQlJBUlkxGzAZBgNVBAMTEnB1YmxpY2F0aW9u
-cy5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0BraWIua2kuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC11ax7K5PjR3GFpvzT37OKa1ycH3Rt
-z0GNApRMQtS7x9q1wgRjA3dqdTSIIJettkBgyEUOfB0f1MgcaMtaNIPhDJfMCqdr
-Q6dPKp+F0b7P7jWezyWNt8gVKXSOaeJYjze56zURO+MK8CA4sTpttqgcOOv5pnhN
-wyEuYmQBYtKGvcH13jJPStsQ+s5LZ9NX/5gV64DrRI4s64d9r0FH78lHzkM2TqHI
-0ce2KeZdn3AgXy1tOW58nUKVlUNgsFZyg/GH0ICZ08tOo1YHWBu1iuZQrzfKI655
-j8R4gElSbT+Sp770OoC9qgoBsQQdh3N/Pj+/RvgSTMG3cOmtIlNu/YjpAgMBAAGj
-ggEXMIIBEzAdBgNVHQ4EFgQUjs01iDGc22yXqpCThMLfgM12WCAwgeMGA1UdIwSB
-2zCB2IAUjs01iDGc22yXqpCThMLfgM12WCChgbSkgbEwga4xCzAJBgNVBAYTAlNF
-MRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4wDAYDVQQHEwVTb2xuYTEeMBwGA1UEChMV
-S2Fyb2xpbnNrYSBJbnN0aXR1dGV0MRswGQYDVQQLExJVTklWRVJTSVRZIExJQlJB
-UlkxGzAZBgNVBAMTEnB1YmxpY2F0aW9ucy5raS5zZTEgMB4GCSqGSIb3DQEJARYR
-dWJpdGRvc0BraWIua2kuc2WCCQDkMpFmVAmaajAMBgNVHRMEBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQBcI4P5JLCJuTCKie7Ze/NucF3tBgcXllnSYo7z4NSafr0i
-CrsoBPoxg1Sr7cFXSCRWLUr7Di2WfdQLrn3ZY1sPTYKWlgEmWVYFiSph2HYv04L9
-I72Jn8DLvaNCqew7KYgCODkSFRUFxzGDlWho0cXHMwP31/dEVEa2mUwmMEzG+ScQ
-DII+Op9QBwqJ7VgT7RLwhH6txbcicwNdfQYktXy/C7ysmUAS6XW1vE3H3LDd6Oc5
-98OMIxMcebzCxLN0jT93KgoWEq2eaGQi0h4TPZ7ZGmCkVQICVvSNjEKguACD/j9o
-ryntMn54coBlF2Vqrm4Fa2XUyUIkurCv3FZtdN5W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://publications.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://publications.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://publications.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://publications.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publications.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://publications.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>KIB-IT</md:GivenName>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9d78ae17..224a3f89 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -84,12 +84,10 @@
   <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/publications.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/brainstorm.swami.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.lobber.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www07test.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/fordrop.irt.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/bardo.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/unitcf.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
@@ -539,7 +537,6 @@
   <xi:include href="swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml"/>
   <xi:include href="swamid-2.0/backweb.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/anvandare.antagning.se-anvandare-sp.xml"/>
-  <xi:include href="swamid-2.0/proxytest.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/account-idac.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml"/>