Remove Ping Pongs SPs.

Signed-off by girgen@pingpong.se
author: Johan Wassberg <jocar@sunet.se> 2022-08-22 14:39:13 +0200
committer: Johan Wassberg <jocar@sunet.se> 2022-08-22 14:39:13 +0200
commit: a9bc2da1e866c85e67884efc2f78207253a0af17 (patch)
tree: 8d3f2c029b6ca0eeaac15e3e3901d5e2c749631f
parent: 2814aee3795ac54fa53c1a6f9f1b7dada1fc4381 (diff)
14 files changed, 0 insertions, 1037 deletions
diff --git a/swamid-2.0/gih.pingpong.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/gih.pingpong.se-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index 11f8429a..00000000
--- a/swamid-2.0/gih.pingpong.se-Shibboleth.sso-Metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<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://gih.pingpong.se/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-07-30T10:01:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">PING PONG vid GIH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PING PONG at GIH</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan.</mdui:Description>
-        <mdui:Description xml:lang="en">The learning platform PING PONG at The Swedish School of Sport and Health Sciences.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="168" width="50">https://gih.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="168" width="50">https://gih.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://gih.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://gih.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
-      </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://gih.pingpong.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://lillaedet.pingpong.se/shibboleth</ds:KeyName>
-        <ds:KeyName>lillaedet.pingpong.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lillaedet.pingpong.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAMNpqZY0cUukMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTAeFw0xMjAxMTgxMDU4MjZaFw0yMjAx
-MTUxMDU4MjZaMCAxHjAcBgNVBAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8GQM1LnsvyXPnZh9ZlWhG3gkJB
-0H8I7kkVO017B7AmQvFingsCaIHBFnglKRyTml5lw5My4NGi9QVWLSd5IIoDD9Is
-uRR5tEU0+G6eyxQy08MZMB0XwamC+8BsU/0rOc5zmA+iAS3LDZO4m+gLOwWYorbg
-a6ViHplIrOUOBeUT1j4D3MJs5LBpJ/Ruvf4sAzP/eA8uCr7Wo13Geq+8lJodV917
-D+/KbGbOHZMkhCb9iCZpdJVvnVGWWuQbYMfAxaRcGkIMKZOcFiseCJ1tUlrb9YFD
-WuPcF7kFr0nzGmqVyqFd7zedMNzIEyBVlEa3YwcwxQSlopVf9FBm5FNGi88CAwEA
-AaNtMGswSgYDVR0RBEMwQYIVbGlsbGFlZGV0LnBpbmdwb25nLnNlhihodHRwczov
-L2xpbGxhZWRldC5waW5ncG9uZy5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBQS1rOl
-mFqPheIlLCkc2f6dkjPjGDANBgkqhkiG9w0BAQUFAAOCAQEAYJ+J6GqQXCjnDI4j
-jeT1SSEpDmEgH4JtaJbth2Ymz1lw8DAwF51aXK+9ylY239V2tQ7cVYdYdeNLsK8S
-i8WGFEPepAJevRES3TbZmBkx63vg6KFtONBFa4FiDAHv7Ja7fGPC/jo4+7V+174j
-wdfS6g4c1YW8xMNOHgdAbeMVk365DD3vYv796T6m9oaZfp41fOkvQ2Ly7lD1P53d
-kYPtN92O/M+IGG8b3FF4UQ3tTnC8N9D6YF18X5GK+W1tSQfZ7jAf3sAK9yrXuZv2
-AyhVkxRiEnLD4tvVDNFseCCzGAomlzCuOU2QY5TyK6VbtwKvxZvUc6GQF5y7h1aN
-UIZtDw==
-</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://gih.pingpong.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gih.pingpong.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gih.pingpong.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml b/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
deleted file mode 100644
index 918498fd..00000000
--- a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
+++ /dev/null
@@ -1,125 +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://lartorget.sll.se/luvit/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-21T15:48:17Z">
-      <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla: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://lartorget.sll.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://lartorget.sll.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SSL Lärtorget</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SSL Lärtorget</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärtorget är Stockholms Läns landsting (SLL) portal för e-utbildningar och utbildningsadministration och vänder sig till anställda, studenter och övriga samarbetspartners</mdui:Description>
-        <mdui:Description xml:lang="en">Lärtorget är Stockholms Läns landsting (SLL) portal för e-utbildningar och utbildningsadministration och vänder sig till anställda, studenter och övriga samarbetspartners</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>grprdweb04</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=grprdweb04</ds:X509SubjectName>
-          <ds:X509Certificate>MIID5TCCAk2gAwIBAgIJAJUz27MeGuxQMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV
-BAMTCmdycHJkd2ViMDQwHhcNMTgwOTE2MDc0NzE1WhcNMjgwOTEzMDc0NzE1WjAV
-MRMwEQYDVQQDEwpncnByZHdlYjA0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAmwNJ8JM/HIn+ZJA8h7lvu94Vq9meH5akY8Qny4GEZYXzU4X+QcgNpvv1
-l2AKGIHOkWNJJngPX1P+Y5uCtdNs3zwcTCbrTccdwkdlL4b0gs9ItuXkqIJVOmqO
-v2iJwhl880LHhZYOwGadKf6Cx+xbD4GQf+DOJta5SnFPRNKiYD1Et7ixRKjuyZPx
-Ns/5WmSK2eKsC+S6IuU7xdZABTvGBBEox6pQzNx3EZDvH9LrSHF+/NbLLHS1eqkO
-JfIx8y0qG958xbnmEqCszb7Dl9VgT3FtxFe9vgaYaqT6r4DL9swa4fW91ycGQj1K
-ZpGo61o4WdNMnO5N7xnuASXzBZCkCbtrB+x6lVECcugBz/NEeMrFGW+PDEaZNWAB
-DI/CD9nFudkJW34zLDDd0xoQH0SqGTFv/nlzmikG2x2RIgc4TYYr5f5RAHuQpLoJ
-X384cNNZ+Hszk3CVum743vfhjlfZ3INVuFhn5WSGVSFnErYoMq3eEyvKlZGOnPGu
-rI+Y+x+ZAgMBAAGjODA2MBUGA1UdEQQOMAyCCmdycHJkd2ViMDQwHQYDVR0OBBYE
-FAqnC2iVRZPabotaiHJ1yzPV+xZqMA0GCSqGSIb3DQEBCwUAA4IBgQCOWgodQNtH
-5xSOwXg/FbefJYA3blkC3RvrAgI5gwWMX38spCLt4R3na4UpHhvz+A1n0DQx15qr
-Ju+f2/odwdz4RQotDvI8nN17GLzx/kKS61MRhq+Np8gOxycdSSyKk9CgsGWu5KlF
-nflXjJR+KpIyfGxYYqGH9fpEYOPywwzVCbooGz3ZvHPcZTnSPMgNp3L5q3Ixm8ao
-ZrD44AcwURZW2Zte+fkzjF3sUWNAr4z+x21oGM/AuI3UNq31ErXa54XT+bkiJHAx
-G58FtGHjB59hA2aF8bVF19efFuVn2lMczcgtlRMUGisG7gNSQAP4CINgiVBfImuo
-iHp2hQ2ro0LTmxIGy/bwPGSzCita8lDc835bvdo3usyXtcpwEkaMvEXOFTIeaLE0
-GbAuXNg1dkCnpKUP5o+u6YhmV3yvEr4jFq3hT9l9MRFfKBerFrYE3LHO5LQT1G/V
-p9St9weyi1tb9x6elY6NNPCbM1HQnIZs93CWZYs8JBdJCnK9c/cfMfg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>grprdweb04</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=grprdweb04</ds:X509SubjectName>
-          <ds:X509Certificate>MIID5TCCAk2gAwIBAgIJAMwK/jRgH8tTMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV
-BAMTCmdycHJkd2ViMDQwHhcNMTgwOTE2MDc0NzEyWhcNMjgwOTEzMDc0NzEyWjAV
-MRMwEQYDVQQDEwpncnByZHdlYjA0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAy4tpwwGVBmFsjes8aG9brEsYq/+x8jgaDaUQbbG/bNqOW4RiutinB3GQ
-pbw9SDIBA/YmuwKb0QZVgmk9LJAHYcFmyXZwOacHTJpQr7Qtq9usJYBd4Epb7Eto
-sc//h1rrlPZkVJUjICUuTHbbP8Ct7aoIc/nRmpdUQ0SrQU+ro4/iRmRN/EWp1eB4
-J/mysL21FdtrhirYy/j5JZ0zA4ujWLBOnoTAxJOjUR/wBChvhdsoQ875yv93YJQT
-PyRfh54CYGpHVMwvHfhFGaQisweMbU3GdvIizuljmHPFJRE9ooU+5Ht2cq4bA8bT
-tbw6sNfOx+bBX0kH1jbXeW3ZHZFO3Ja5FxTEP8hFT56It2r3S8qKuRQPV64mGkF6
-arg3CZyFt63PGquba2mr0mNDy82yedimBjL8UGBcKEyXmvVIGnK0jTD/r6QZXLPe
-4+PQUAuObQ5QdlqMmyazIGkh+xEhtR1E3iq3/4WNlvtGdyPfPPsAt87WGr4faPn4
-EbAzIQ73AgMBAAGjODA2MBUGA1UdEQQOMAyCCmdycHJkd2ViMDQwHQYDVR0OBBYE
-FMJbUapw7wDTVkKnEAoOQZaqGJxbMA0GCSqGSIb3DQEBCwUAA4IBgQAyjxZYO+DQ
-eZz0q/aMCM+qjmi2wdQSTrsA2CG1fYvYRAk3LQ8dnT8y2yZvB0qQrHAJlls+xr+q
-o0P4Z9eR2tdC4Y8ystdt0gzNVCMdwR9wZa//Mx3gk+5YIlM1aML9rGXFW22R2wHd
-uZK1zWH1WyYmtqmb/uNH6S5Uo6INW0MCavjQAX50hWHpi0xVnEQ1JZtGbaeXGQ9e
-gM9/AFoRT2yaSaqVX3pXj7TjtH29XHcVZiCrtfw6OWHNuto8tkEjSBjY0xdGXhKU
-caOF3ht9TgtTIe/y8wV6oNvxPiQlyCQT5YadWrV9CPcp2gfevdGRdXfl/flSnRay
-jM+APHttrPNflE223UDbI7XufH4cTS8CJP98/7tHLiWHG5MYCx49DRTY+Anmd5O8
-emi7Rc2q9e5ejnTNCt19+AvUUGhnq8A+yEAisQW5z2nv08rVSyYb/vRlpm5q8y8q
-lmNgza+oGPGkyvuOaiCHWwyRsT9UmlVUOgZK1z5rZVSSSJiR7tRdYrE=
-</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://lartorget.sll.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lartorget.sll.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lartorget.sll.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lartorget.sll.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lartorget.sll.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lartorget.sll.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:lartorget.hsf@sll.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lartorget.sll.se-shibboleth.xml b/swamid-2.0/lartorget.sll.se-shibboleth.xml
deleted file mode 100644
index 7ae33487..00000000
--- a/swamid-2.0/lartorget.sll.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://lartorget.sll.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-01-28T08:40:48Z">
-      <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla: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">
-    <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://lartorget.sll.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://lartorget.sll.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Lärtorget (SLL)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lärtorget (SLL)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärtorget är Stockholms läns landstings utbildningsplattform PING PONG.</mdui:Description>
-        <mdui:Description xml:lang="en">Lärtorget is Stockholms läns landsting's learning platform PING PONG.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="54" width="350">https://lartorget.sll.se/pp/lookAndFeel/skins/sll_simple/images/logotype-open-web.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="54" width="350">https://lartorget.sll.se/pp/lookAndFeel/skins/sll_simple/images/logotype-open-web.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>curuba.pingpong.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=curuba.pingpong.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAN3d7U7ah5lIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2N1cnViYS5waW5ncG9uZy5uZXQwHhcNMTMwODI5MTMzNDQwWhcNMjMwODI3
-MTMzNDQwWjAeMRwwGgYDVQQDExNjdXJ1YmEucGluZ3BvbmcubmV0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA13Kb3lhHuodhcIiVSvKl/NZm1sccLbMZ
-zv2kV2zhI/K8e9F4LBBvpWOOlphpcHjJt6XLPgDgPZ9sZTkmqskYbhH07/U4A4KU
-QMnE4sqi1MZDUL70hGlEIZziC6/oUGLenN0X0xxvmiNUb+9Wp+H8zsnroU5osQVn
-Q0XLzEIcu7BU2b9OIeraj/kkEb53OIpgq+eLcVt2Rlt52E6liLwy0spsBsbF4sJw
-CmbSwSyrX66WHxHuKWS7L8L8J+/ZuChG+wwFLPUYf9fwrz8shrG4kkrbRQXrof96
-f3G8CgDHbuItM00k5oMtyvOLJddtA6ercw0s6l5BlVcZq33NU/UUbQIDAQABo0Ew
-PzAeBgNVHREEFzAVghNjdXJ1YmEucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQPORor
-5olzvLgaijcalbsmoy3Y9TANBgkqhkiG9w0BAQUFAAOCAQEACDRKS8J4KPA1YZVr
-EegqlQcipOJq5ABOJd6NTho9ApmBhwamdgPNrwjt4omFs+boIm9NPUnLaq8w1ms8
-JCPWFsWuV4SfFGddtNbzyDPYT+Og3jDZAOm7+6cxHAjCZXxB+ap/uF/3ibrYh/YI
-KmF/9d3K2rpuoepS3j4L1gpsk4irXYlD3bY7Krs5uotwJtNb0U9TXkQp2wbapEwm
-oLfT4WULlurUQvzFckCFEEIv/ukeP393U5mxWxrmA6Rns9PEvFFz0tniXUAOWdoG
-ljkTH3ji5vjgzALpSGwoYsS0SRhsPkICyhrroUOAZdx6AOC181wdrahjsjrPf0F3
-XFg/xw==
-</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://lartorget.sll.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lartorget.sll.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lartorget.sll.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lartorget.sll.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lartorget.sll.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lartorget.sll.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/pingpong.ki.se-shibboleth.xml b/swamid-2.0/pingpong.ki.se-shibboleth.xml
deleted file mode 100644
index 7510c61b..00000000
--- a/swamid-2.0/pingpong.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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://pingpong.ki.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-09-23T08:29:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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: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">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ping Pong för Karolinska Institutet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ping Pong at Karolinska Institutet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ping Pong för Karolinska Institutet</mdui:Description>
-        <mdui:Description xml:lang="en">Ping Pong at Karolinska Institutet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC8TCCAdmgAwIBAgIJAJRsfqnb5dadMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDnBpbmdwb25nLmtpLnNlMB4XDTEzMDkxNjEzNDM0N1oXDTIzMDkxNDEzNDM0
-N1owGTEXMBUGA1UEAxMOcGluZ3Bvbmcua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDNcTge2C3djDCz0us+maMDKxRHA9p9khcf6XLYjnPYLYQ2
-s4GfGF+rz7FAxHvJoe9792ecpa91/TBoV/wnsyQfXLlAQd7eqNk/MzALugXjeL65
-+Frn6Wp6cbcnJasRmcxdiiplHYReln/KYkmC+fQ1PDfe5RpXaxNjB6RKWprJkU83
-iIqVL7aW/tY+hmDIEzYJpH5UjXFdqJwbOOmetuzCZxxLrCq6Er8whneqxEVjvlmf
-QQG8OYsZVjba2iJuiGD9B8bnVvgb6WvzWAtUAxWi5tnjrWUo0Jvo0h0nTsG1uV0L
-lP08Fu7Y12kuphUqKgKZ2q5PgxgzGIt3MDpTrHATAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDnBpbmdwb25nLmtpLnNlMB0GA1UdDgQWBBS6tjhUSTBnGMltLrTV11n4WyNS
-6TANBgkqhkiG9w0BAQUFAAOCAQEApmdue4DcHojlyrLK4XxSRXSuAQ0vADzZe9pF
-Cs3mMApyUpT3ritm+Pn+QAvbNux3urijNWw/OWJ/sVsc6Jj59aIkRutV+r8AbqFO
-SvTLPxlXLgIU+v90UJ/0WG3YxMLafujRrDs15vJLbJSc4ATgypIUOrNcq5ZhskGN
-nVBA3mrjY5hhQpkl4816R3IYwzsxn1NWtbdg8c964Nm1hLrah1CIeOFlxycV8OF+
-qNmB+qBiK5APim+7qOT6QRnSzX3q2zIb8WYwE6Pvb9aVcM8GBmOvyZvITpBZik04
-ZqAEwFI6mSdqDAH/wGtQLWPtrVSKg/XmB9+G8JohgWpphQElSQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/rkh.pingpong.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/rkh.pingpong.se-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index 39b71378..00000000
--- a/swamid-2.0/rkh.pingpong.se-Shibboleth.sso-Metadata.xml
+++ /dev/null
@@ -1,49 +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://rkh.pingpong.se/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-10-10T09:33:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">PING PONG vid RKH </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PING PONG at RKH </mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärplattformen PING PONG vid Röda korsets högskola. </mdui:Description>
-        <mdui:Description xml:lang="en">The learning platform PING PONG at The Swedish Red Cross University College. </mdui:Description>
-        <mdui:Logo xml:lang="sv" height="168" width="50">https://rkh.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="168" width="50">https://rkh.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://rkh.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://rkh.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
-      </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://rkh.pingpong.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAMNpqZY0cUukMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTAeFw0xMjAxMTgxMDU4MjZaFw0yMjAx
-MTUxMDU4MjZaMCAxHjAcBgNVBAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8GQM1LnsvyXPnZh9ZlWhG3gkJB
-0H8I7kkVO017B7AmQvFingsCaIHBFnglKRyTml5lw5My4NGi9QVWLSd5IIoDD9Is
-uRR5tEU0+G6eyxQy08MZMB0XwamC+8BsU/0rOc5zmA+iAS3LDZO4m+gLOwWYorbg
-a6ViHplIrOUOBeUT1j4D3MJs5LBpJ/Ruvf4sAzP/eA8uCr7Wo13Geq+8lJodV917
-D+/KbGbOHZMkhCb9iCZpdJVvnVGWWuQbYMfAxaRcGkIMKZOcFiseCJ1tUlrb9YFD
-WuPcF7kFr0nzGmqVyqFd7zedMNzIEyBVlEa3YwcwxQSlopVf9FBm5FNGi88CAwEA
-AaNtMGswSgYDVR0RBEMwQYIVbGlsbGFlZGV0LnBpbmdwb25nLnNlhihodHRwczov
-L2xpbGxhZWRldC5waW5ncG9uZy5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBQS1rOl
-mFqPheIlLCkc2f6dkjPjGDANBgkqhkiG9w0BAQUFAAOCAQEAYJ+J6GqQXCjnDI4j
-jeT1SSEpDmEgH4JtaJbth2Ymz1lw8DAwF51aXK+9ylY239V2tQ7cVYdYdeNLsK8S
-i8WGFEPepAJevRES3TbZmBkx63vg6KFtONBFa4FiDAHv7Ja7fGPC/jo4+7V+174j
-wdfS6g4c1YW8xMNOHgdAbeMVk365DD3vYv796T6m9oaZfp41fOkvQ2Ly7lD1P53d
-kYPtN92O/M+IGG8b3FF4UQ3tTnC8N9D6YF18X5GK+W1tSQfZ7jAf3sAK9yrXuZv2
-AyhVkxRiEnLD4tvVDNFseCCzGAomlzCuOU2QY5TyK6VbtwKvxZvUc6GQF5y7h1aN
-UIZtDw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rkh.pingpong.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index e215f57b..00000000
--- a/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://shh.pingpong.se/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-07-03T12:35:37Z">
-      <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">PING PONG vid Sophiahemmet högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PING PONG at Sophiahemmet University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärplattformen PING PONG vid Sophiahemmet högskola.</mdui:Description>
-        <mdui:Description xml:lang="en">The learning platform PING PONG at Sophiahemmet University.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="168" width="50">https://shh.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="168" width="50">https://shh.pingpong.se/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://shh.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://shh.pingpong.se/login/pingpong-logo-16x16.png</mdui:Logo>
-      </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://shh.pingpong.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://shh.pingpong.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://lillaedet.pingpong.se/shibboleth</ds:KeyName>
-        <ds:KeyName>lillaedet.pingpong.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lillaedet.pingpong.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAMNpqZY0cUukMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTAeFw0xMjAxMTgxMDU4MjZaFw0yMjAx
-MTUxMDU4MjZaMCAxHjAcBgNVBAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8GQM1LnsvyXPnZh9ZlWhG3gkJB
-0H8I7kkVO017B7AmQvFingsCaIHBFnglKRyTml5lw5My4NGi9QVWLSd5IIoDD9Is
-uRR5tEU0+G6eyxQy08MZMB0XwamC+8BsU/0rOc5zmA+iAS3LDZO4m+gLOwWYorbg
-a6ViHplIrOUOBeUT1j4D3MJs5LBpJ/Ruvf4sAzP/eA8uCr7Wo13Geq+8lJodV917
-D+/KbGbOHZMkhCb9iCZpdJVvnVGWWuQbYMfAxaRcGkIMKZOcFiseCJ1tUlrb9YFD
-WuPcF7kFr0nzGmqVyqFd7zedMNzIEyBVlEa3YwcwxQSlopVf9FBm5FNGi88CAwEA
-AaNtMGswSgYDVR0RBEMwQYIVbGlsbGFlZGV0LnBpbmdwb25nLnNlhihodHRwczov
-L2xpbGxhZWRldC5waW5ncG9uZy5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBQS1rOl
-mFqPheIlLCkc2f6dkjPjGDANBgkqhkiG9w0BAQUFAAOCAQEAYJ+J6GqQXCjnDI4j
-jeT1SSEpDmEgH4JtaJbth2Ymz1lw8DAwF51aXK+9ylY239V2tQ7cVYdYdeNLsK8S
-i8WGFEPepAJevRES3TbZmBkx63vg6KFtONBFa4FiDAHv7Ja7fGPC/jo4+7V+174j
-wdfS6g4c1YW8xMNOHgdAbeMVk365DD3vYv796T6m9oaZfp41fOkvQ2Ly7lD1P53d
-kYPtN92O/M+IGG8b3FF4UQ3tTnC8N9D6YF18X5GK+W1tSQfZ7jAf3sAK9yrXuZv2
-AyhVkxRiEnLD4tvVDNFseCCzGAomlzCuOU2QY5TyK6VbtwKvxZvUc6GQF5y7h1aN
-UIZtDw==
-</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://shh.pingpong.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shh.pingpong.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shh.pingpong.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shh.pingpong.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/slltest2.luvit.se-shibboleth.xml b/swamid-2.0/slltest2.luvit.se-shibboleth.xml
deleted file mode 100644
index 0493a306..00000000
--- a/swamid-2.0/slltest2.luvit.se-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://slltest2.luvit.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-21T15:48:17Z">
-      <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:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://slltest2.luvit.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://slltest2.luvit.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SSL Lärtorget tillfällig</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SSL Lärtorget tillfällig</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärtorget är Stockholms Läns landsting (SLL) portal för e-utbildningar och utbildningsadministration och vänder sig till anställda, studenter och övriga samarbetspartners</mdui:Description>
-        <mdui:Description xml:lang="en">Lärtorget är Stockholms Läns landsting (SLL) portal för e-utbildningar och utbildningsadministration och vänder sig till anställda, studenter och övriga samarbetspartners</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>grprdweb04</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=grprdweb04</ds:X509SubjectName>
-          <ds:X509Certificate>MIID5TCCAk2gAwIBAgIJAJUz27MeGuxQMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV
-BAMTCmdycHJkd2ViMDQwHhcNMTgwOTE2MDc0NzE1WhcNMjgwOTEzMDc0NzE1WjAV
-MRMwEQYDVQQDEwpncnByZHdlYjA0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAmwNJ8JM/HIn+ZJA8h7lvu94Vq9meH5akY8Qny4GEZYXzU4X+QcgNpvv1
-l2AKGIHOkWNJJngPX1P+Y5uCtdNs3zwcTCbrTccdwkdlL4b0gs9ItuXkqIJVOmqO
-v2iJwhl880LHhZYOwGadKf6Cx+xbD4GQf+DOJta5SnFPRNKiYD1Et7ixRKjuyZPx
-Ns/5WmSK2eKsC+S6IuU7xdZABTvGBBEox6pQzNx3EZDvH9LrSHF+/NbLLHS1eqkO
-JfIx8y0qG958xbnmEqCszb7Dl9VgT3FtxFe9vgaYaqT6r4DL9swa4fW91ycGQj1K
-ZpGo61o4WdNMnO5N7xnuASXzBZCkCbtrB+x6lVECcugBz/NEeMrFGW+PDEaZNWAB
-DI/CD9nFudkJW34zLDDd0xoQH0SqGTFv/nlzmikG2x2RIgc4TYYr5f5RAHuQpLoJ
-X384cNNZ+Hszk3CVum743vfhjlfZ3INVuFhn5WSGVSFnErYoMq3eEyvKlZGOnPGu
-rI+Y+x+ZAgMBAAGjODA2MBUGA1UdEQQOMAyCCmdycHJkd2ViMDQwHQYDVR0OBBYE
-FAqnC2iVRZPabotaiHJ1yzPV+xZqMA0GCSqGSIb3DQEBCwUAA4IBgQCOWgodQNtH
-5xSOwXg/FbefJYA3blkC3RvrAgI5gwWMX38spCLt4R3na4UpHhvz+A1n0DQx15qr
-Ju+f2/odwdz4RQotDvI8nN17GLzx/kKS61MRhq+Np8gOxycdSSyKk9CgsGWu5KlF
-nflXjJR+KpIyfGxYYqGH9fpEYOPywwzVCbooGz3ZvHPcZTnSPMgNp3L5q3Ixm8ao
-ZrD44AcwURZW2Zte+fkzjF3sUWNAr4z+x21oGM/AuI3UNq31ErXa54XT+bkiJHAx
-G58FtGHjB59hA2aF8bVF19efFuVn2lMczcgtlRMUGisG7gNSQAP4CINgiVBfImuo
-iHp2hQ2ro0LTmxIGy/bwPGSzCita8lDc835bvdo3usyXtcpwEkaMvEXOFTIeaLE0
-GbAuXNg1dkCnpKUP5o+u6YhmV3yvEr4jFq3hT9l9MRFfKBerFrYE3LHO5LQT1G/V
-p9St9weyi1tb9x6elY6NNPCbM1HQnIZs93CWZYs8JBdJCnK9c/cfMfg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>grprdweb04</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=grprdweb04</ds:X509SubjectName>
-          <ds:X509Certificate>MIID5TCCAk2gAwIBAgIJAMwK/jRgH8tTMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV
-BAMTCmdycHJkd2ViMDQwHhcNMTgwOTE2MDc0NzEyWhcNMjgwOTEzMDc0NzEyWjAV
-MRMwEQYDVQQDEwpncnByZHdlYjA0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
-igKCAYEAy4tpwwGVBmFsjes8aG9brEsYq/+x8jgaDaUQbbG/bNqOW4RiutinB3GQ
-pbw9SDIBA/YmuwKb0QZVgmk9LJAHYcFmyXZwOacHTJpQr7Qtq9usJYBd4Epb7Eto
-sc//h1rrlPZkVJUjICUuTHbbP8Ct7aoIc/nRmpdUQ0SrQU+ro4/iRmRN/EWp1eB4
-J/mysL21FdtrhirYy/j5JZ0zA4ujWLBOnoTAxJOjUR/wBChvhdsoQ875yv93YJQT
-PyRfh54CYGpHVMwvHfhFGaQisweMbU3GdvIizuljmHPFJRE9ooU+5Ht2cq4bA8bT
-tbw6sNfOx+bBX0kH1jbXeW3ZHZFO3Ja5FxTEP8hFT56It2r3S8qKuRQPV64mGkF6
-arg3CZyFt63PGquba2mr0mNDy82yedimBjL8UGBcKEyXmvVIGnK0jTD/r6QZXLPe
-4+PQUAuObQ5QdlqMmyazIGkh+xEhtR1E3iq3/4WNlvtGdyPfPPsAt87WGr4faPn4
-EbAzIQ73AgMBAAGjODA2MBUGA1UdEQQOMAyCCmdycHJkd2ViMDQwHQYDVR0OBBYE
-FMJbUapw7wDTVkKnEAoOQZaqGJxbMA0GCSqGSIb3DQEBCwUAA4IBgQAyjxZYO+DQ
-eZz0q/aMCM+qjmi2wdQSTrsA2CG1fYvYRAk3LQ8dnT8y2yZvB0qQrHAJlls+xr+q
-o0P4Z9eR2tdC4Y8ystdt0gzNVCMdwR9wZa//Mx3gk+5YIlM1aML9rGXFW22R2wHd
-uZK1zWH1WyYmtqmb/uNH6S5Uo6INW0MCavjQAX50hWHpi0xVnEQ1JZtGbaeXGQ9e
-gM9/AFoRT2yaSaqVX3pXj7TjtH29XHcVZiCrtfw6OWHNuto8tkEjSBjY0xdGXhKU
-caOF3ht9TgtTIe/y8wV6oNvxPiQlyCQT5YadWrV9CPcp2gfevdGRdXfl/flSnRay
-jM+APHttrPNflE223UDbI7XufH4cTS8CJP98/7tHLiWHG5MYCx49DRTY+Anmd5O8
-emi7Rc2q9e5ejnTNCt19+AvUUGhnq8A+yEAisQW5z2nv08rVSyYb/vRlpm5q8y8q
-lmNgza+oGPGkyvuOaiCHWwyRsT9UmlVUOgZK1z5rZVSSSJiR7tRdYrE=
-</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://slltest2.luvit.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slltest2.luvit.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slltest2.luvit.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slltest2.luvit.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slltest2.luvit.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://slltest2.luvit.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slltest2.luvit.se/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slltest2.luvit.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slltest2.luvit.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slltest2.luvit.se/Shibboleth.sso/SAML2/POST" index="10"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:lartorget.hsf@sll.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test-ki.pingpong.net-shibboleth.xml b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
deleted file mode 100644
index 2c72684d..00000000
--- a/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
+++ /dev/null
@@ -1,58 +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://test-ki.pingpong.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-28T12:37:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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: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">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">TEST-Ping Pong för Karolinska Institutet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TEST-Ping Pong at Karolinska Institutet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">TEST-Ping Pong för Karolinska Institutet</mdui:Description>
-        <mdui:Description xml:lang="en">TEST-Ping Pong at Karolinska Institutet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>test-ki.pingpong.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=test-ki.pingpong.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAKke/HWraFEaMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHRlc3Qta2kucGluZ3BvbmcubmV0MB4XDTEzMDMwNDE0MjE1MVoXDTIzMDMw
-MjE0MjE1MVowHzEdMBsGA1UEAxMUdGVzdC1raS5waW5ncG9uZy5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD8F/Hn17uq+rn10/Bbr6ElD63OXM7
-Dxb/1xNZktCxAR/T4nZjSodwCvhnO/puL3Ptmmn1qv+8jA78P2AlULVdK9WHLRla
-FecvIi29XM2DQ5rr9clgyuv5BUa4Td41Cyl6+4Mp2NsBKmgFKHDb/qudhAgyi+my
-DWk4glwa2zMU8Fn5QtC1iVwKKOpnt9Xng5j5hbl+jpVumkkaJmGs5azOWPXW9bYU
-lLV44caWovEeMW8zuYgS0s2chhYKUdNkaC3TWW3sF4ba4wZ8VjVlCNfZCv4BEGSw
-PjDctsS+oF81iGr7OqDLMuMEMEEgUbUS9f/Kh5H0gY+XYeV19fKQNTktAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHRlc3Qta2kucGluZ3BvbmcubmV0MB0GA1UdDgQWBBSB
-a8uQfGlkFs7xab4+bx+IjZDBwTANBgkqhkiG9w0BAQUFAAOCAQEAGpjpDbme/tDQ
-kzIJRIzcxnWdSOTJZWBSnjdiLhz6vGmWV0AaP6MZohqtvNhcklTCIoEJnu2hQ74J
-VmZiGlCk+Mc9ZrgJv7awVPeM9tveJ5T7b1fLzWzny7EMid0UbItJgRUSSHksUKx6
-L5CtHyFfp1ITBipobSXHbR/uwuITY76AVKgWIhQSnOezzC8/HjwP1kXqsd78NJHv
-NhnZvkg4C2FRLjmnVNcWu1/y3xIs5JIBSjRyxJ/hKeFI+K8vQguW15ADzEuTMWCc
-/XHDmn241PpSSSArPvx3Q1Mt2nPp7NBDIQcGoQ482yBAhvCLJUjcPDm1CwjqZj+x
-kRz90uqHpg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-ki.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/POST" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test-lartorget.sll.se-shibboleth.xml b/swamid-2.0/test-lartorget.sll.se-shibboleth.xml
deleted file mode 100644
index 5db542f2..00000000
--- a/swamid-2.0/test-lartorget.sll.se-shibboleth.xml
+++ /dev/null
@@ -1,61 +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://test-lartorget.sll.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-02-16T08:25:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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">
-    <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://test-lartorget.sll.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://test-lartorget.sll.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">TEST-Lärtorget (SLL)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TEST-Lärtorget (SLL)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">TEST-Lärtorget är Stockholms läns landstings TESTVERSION utbildningsplattform PING PONG.</mdui:Description>
-        <mdui:Description xml:lang="en">TEST-Lärtorget is Stockholms läns landsting's TEST VERSION learning platform PING PONG.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="54" width="350">https://test-lartorget.sll.se/pp/lookAndFeel/skins/sll_simple/images/logotype-open-web.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="54" width="350">https://test-lartorget.sll.se/pp/lookAndFeel/skins/sll_simple/images/logotype-open-web.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>test-sll.pingpong.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=test-sll.pingpong.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAMdenEuj+sDrMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFXRlc3Qtc2xsLnBpbmdwb25nLm5ldDAeFw0xNDExMDYyMTAxNDRaFw0yNDEx
-MDMyMTAxNDRaMCAxHjAcBgNVBAMTFXRlc3Qtc2xsLnBpbmdwb25nLm5ldDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMFiltnBOTAFkZskQlRyVd03ghCy
-O0YR0RtPx5LESwXUrcNkvVmG6NqcVLVOCMSwwrOp/C43YQMvPd/DHetP6wkj7U+V
-Frc+AlBbS9OxyL1+ie2kSrVXEvICahkIQ5Lkn6mKyfciXeRxdrwI3Qbu+e64XBT0
-zgrHUovibxsel6SgBVUopUH8oSf0MPCzY3eOGwF03ghUCHZ+LHi47Cvd6ukC9q4l
-7Hh/Yk4sSeBroGvxac77aXw6TZ8R8N8kLD7lCJSROY9YOI5lVy099ADdzYDTnz48
-JbIxQ+gx6QYk+CZypEcjtFCaXIfyjlUcKXyyNVH3X1v6fPjhC7BAG0NI2WUCAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVdGVzdC1zbGwucGluZ3BvbmcubmV0MB0GA1UdDgQW
-BBSMdwXQf8uvmzHBrNH8N6YOkWFF3TANBgkqhkiG9w0BAQUFAAOCAQEAjO9R1vu5
-tW/Kf7V1bXZ+NFfNwe5/+Z5dwI0fp8xj4wrs95H0xmP+K+2LNpuFh9KhrGJlbciH
-JnEGaOa23E2eg09tl484lVE14mOi+Xyr0gTsd4WfRBY0tGjG3xt6G3jByhO2DoDn
-PFSD0rnFE3EzOiQEv/+0+Y5O6K9gAnR64HdMj+jtwWSUgUoagh4TTpTdr1Xebfdf
-AmrsVD8/5Q9repUHd4mFs933hfpYWK0NCYZOItQmTR33GOT76F3tUx6HRsTnkJH3
-JLnPH2AR2SD95+hfPv3PpAl12OYwMkS72VDwMvwMJ0OMMsvx/ExuIuuPK6/CBRd+
-xYxxNbqBOO7+wQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-lartorget.sll.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Palle</md:GivenName>
-    <md:SurName>Girgensohn</md:SurName>
-    <md:EmailAddress>mailto:girgen@pingpong.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test-rkh.pingpong.net-Shibboleth.sso-Metadata.xml b/swamid-2.0/test-rkh.pingpong.net-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index a0be4005..00000000
--- a/swamid-2.0/test-rkh.pingpong.net-Shibboleth.sso-Metadata.xml
+++ /dev/null
@@ -1,48 +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://test-rkh.pingpong.net/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-09-27T09:28:37Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">TEST-PING PONG vid RKH </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TEST-PING PONG at RKH </mdui:DisplayName>
-        <mdui:Description xml:lang="sv">TEST-versionen av Lärplattformen PING PONG vid Röda korsets högskola. </mdui:Description>
-        <mdui:Description xml:lang="en">TEST-versionen av The learning platform PING PONG at The Swedish Red Cross University College. </mdui:Description>
-        <mdui:Logo xml:lang="sv" height="168" width="50">https://test-rkh.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="168" width="50">https://test-rkh.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://test-rkh.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://test-rkh.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-      </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://test-rkh.pingpong.net/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMVvfL7J0nz+MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGtydXNiYXIucGluZ3BvbmcubmV0MB4XDTEyMDYyODE1MDYzMFoXDTIyMDYy
-NjE1MDYzMFowHzEdMBsGA1UEAxMUa3J1c2Jhci5waW5ncG9uZy5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvh+Jg4oen/vUUGtx9eAaYY5rXtTFl
-1nMfq5x3XghdSV8uPg4bQ6VXw/9fZVTnAO3iFrF1LrfjuZWhZN2iL40nXfM1isSR
-mDZDF7CgqwsnoaVodgS/OyL9Q9iGOaXrM2lrN4ucuFAZcd3MUIrZjyBp3jtWkuTp
-T1VHnicxVWbT8VsjrWAdj1MUFv2IeWPP1it+4dwUDZrLqKhRWnFAo8zGHXiyO+aw
-U1Qb/52EShNykDHWBbtzgadLhPQzWQy5E457wvNVFbad0cc29vASufbIhzBGE/U3
-DdVI6jphpn5QMZfHhl9BLoqr9MJh1F1BRlL+HOcLXbQqg0JD/d1d7XAjAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGtydXNiYXIucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQd
-qBIVHafXKIz/Jr3tdLtcKbzR8zANBgkqhkiG9w0BAQUFAAOCAQEAKYOuyj800ABK
-R99elNxsDEddcjmIJQbO5tAosETGVlyqqdWL2D1rtSw0CTQiaba5Ae/TcgR/fnOv
-1g3uBZA26iQPbzsKGKYsB21aUEPJO0ZVhTdcid1tS672fOIZf1Y8+hmNh1psAurp
-DNOpoBNLoM8S8P95Q7hM6xLM76D1R61q4kO3np/YLYwNQSsHnHddu8/9oJu5j7oV
-KGPGrSczPfxG4plIUxm5tzNkHqNyYQttKrXGqdtCdkwjtYxS48G/ba1XkR/+baMf
-D8OuFV1n1oNCM9fqRzlCOyA7ISZyMlfiMCP3HXs53AcrRAnUKYwkP6Q4dIPS3C4Y
-LaCAPwuThQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-rkh.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml b/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index 21b0e066..00000000
--- a/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.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://test-shh.pingpong.net/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-07-03T12:35:37Z">
-      <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">PING PONG vid Sophiahemmets högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PING PONG at Sophiahemmet University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Lärplattformen PING PONG vid Sophiahemmets högskola.</mdui:Description>
-        <mdui:Description xml:lang="en">The learning platform PING PONG at Sophiahemmet University.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="168" width="50">https://test-shh.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="168" width="50">https://test-shh.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://test-shh.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://test-shh.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-      </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://test-shh.pingpong.net/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://test-shh.pingpong.net/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>test-server.pingpong.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=test-server.pingpong.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAIreASj6FsJYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHRlc3Qtc2VydmVyLnBpbmdwb25nLm5ldDAeFw0xNDA2MjcxMjQ4MDhaFw0y
-NDA2MjQxMjQ4MDhaMCMxITAfBgNVBAMTGHRlc3Qtc2VydmVyLnBpbmdwb25nLm5l
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANcJkAXw1cx7St7PPOAP
-UNqdouPe0CSVWODuSEtm8orAub2l9hDnfJiE/K62BYBZGZUaHjrtubaoaKRWts1m
-KSGUmfjwc38wjW5JBGTPAsTqWukNT89CzeKqNWEuPAk8Tcp1hrb+yCCqUtUcZSKL
-H6Zo8dHKCko+2HpYs4SKlJ6TukY9iB/D742FAn9+T7Sjd3XLJgb27LdElZ+Mt1Zl
-QyVeh+VzJHzMjLd8lVi4RwwkVA4T28p056ODUfQ3o4h8JrPSlZVGEb+Ayuq2QRED
-yll+DUGeuGqH/vVBp9n4EUSNTh/GJZ8lbJJcogsHjYIGkIDRi6bPZMnnE6nGSGhT
-pAECAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGVzdC1zZXJ2ZXIucGluZ3BvbmcubmV0
-MB0GA1UdDgQWBBSrXLwS1q7qwcr20Gawl48anQBGLjANBgkqhkiG9w0BAQUFAAOC
-AQEAj54wf6+eQkGfEjUY4ZZZdk5xByccWZjH6gwjYFdjDEsI83YbOVjuCAA46uDG
-TM9YWeg55J3+H/doRkhNbV8nHbNeuzHyHuuixtP7xREl4dRCSu0EQxgJ2FAyo3X+
-6S8wmTtBCXRTXEcgp9jSRLE6iE2EOY2fWa6pxWfLCfQBwSoI2pRXo69OU6vHWO/a
-fuT6EONz4D9pi7t8w6gfnBh+6boCt9KzpnIhq59YOHvcK8PHcMpXz+jSW1W2ZPnE
-umEfUjub2UD/FBc9kMEDX6Qkz7Jr8HF/C414A9IcVXiUxDX8WX3AGpjmV/H4+qna
-OWWW78/lmlGJYmT4C6Fba3Ifag==
-</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://test-shh.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shh.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shh.pingpong.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-shh.pingpong.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
deleted file mode 100644
index 96623d25..00000000
--- a/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<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://testgih.pingpong.net/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-07-30T10:01:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">TEST-PING PONG vid GIH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TEST-PING PONG at GIH</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">test: Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan.</mdui:Description>
-        <mdui:Description xml:lang="en">test: The learning platform PING PONG at The Swedish School of Sport and Health Sciences.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="168" width="50">https://testgih.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="168" width="50">https://testgih.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://testgih.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://testgih.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-      </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://testgih.pingpong.net/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>krusbar.pingpong.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=krusbar.pingpong.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMVvfL7J0nz+MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGtydXNiYXIucGluZ3BvbmcubmV0MB4XDTEyMDYyODE1MDYzMFoXDTIyMDYy
-NjE1MDYzMFowHzEdMBsGA1UEAxMUa3J1c2Jhci5waW5ncG9uZy5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvh+Jg4oen/vUUGtx9eAaYY5rXtTFl
-1nMfq5x3XghdSV8uPg4bQ6VXw/9fZVTnAO3iFrF1LrfjuZWhZN2iL40nXfM1isSR
-mDZDF7CgqwsnoaVodgS/OyL9Q9iGOaXrM2lrN4ucuFAZcd3MUIrZjyBp3jtWkuTp
-T1VHnicxVWbT8VsjrWAdj1MUFv2IeWPP1it+4dwUDZrLqKhRWnFAo8zGHXiyO+aw
-U1Qb/52EShNykDHWBbtzgadLhPQzWQy5E457wvNVFbad0cc29vASufbIhzBGE/U3
-DdVI6jphpn5QMZfHhl9BLoqr9MJh1F1BRlL+HOcLXbQqg0JD/d1d7XAjAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGtydXNiYXIucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQd
-qBIVHafXKIz/Jr3tdLtcKbzR8zANBgkqhkiG9w0BAQUFAAOCAQEAKYOuyj800ABK
-R99elNxsDEddcjmIJQbO5tAosETGVlyqqdWL2D1rtSw0CTQiaba5Ae/TcgR/fnOv
-1g3uBZA26iQPbzsKGKYsB21aUEPJO0ZVhTdcid1tS672fOIZf1Y8+hmNh1psAurp
-DNOpoBNLoM8S8P95Q7hM6xLM76D1R61q4kO3np/YLYwNQSsHnHddu8/9oJu5j7oV
-KGPGrSczPfxG4plIUxm5tzNkHqNyYQttKrXGqdtCdkwjtYxS48G/ba1XkR/+baMf
-D8OuFV1n1oNCM9fqRzlCOyA7ISZyMlfiMCP3HXs53AcrRAnUKYwkP6Q4dIPS3C4Y
-LaCAPwuThQ==
-</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://testgih.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml
deleted file mode 100644
index cf1b6b14..00000000
--- a/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<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://testgu.pingpong.net/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-29T12:38:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">TEST-GUL, PING PONG vid Göteborgs universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TEST-GUL, PING PONG at Gothenburg university</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test version of GUL, Lärplattformen PING PONG vid Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Test version of GUL, The learning platform PING PONG at Gothenburg university.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="50" width="168">https://testgu.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="168">https://testgu.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://testgu.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://testgu.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
-      </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://testgu.pingpong.net/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>testgu.pingpong.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=testgu.pingpong.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAME2EogsaBsxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Rlc3RndS5waW5ncG9uZy5uZXQwHhcNMTUwNzMxMDAxNjI1WhcNMjUwNzI4
-MDAxNjI1WjAeMRwwGgYDVQQDExN0ZXN0Z3UucGluZ3BvbmcubmV0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYPbn4CeU3tNI/8FdjRRUJcTb/gG+g0j
-MvE2RPC//eJw/UR0IwFsJy1R7bwEHynfpwMck+0K9nxNUtp84kN//k86Oy2sQVey
-Ai0OCg5smTguBedA2n8lH7RDFkSvwtoASaGLSEoxXrE0nizDf3uWePLOqewzn5+o
-jXWTS4RhnU12mP+fDVcrO8SqGsbOBXh8AGuUkfLOeyOD9Ayc1rNR6+KuObFqs05q
-BKsy+klw3b1OKk5L2eRgcPlZpNzLIfwVPVpanjItgBdZ1crs58oFpKzarVodjDwY
-kozDsyFCczo/YAlovWq5bvGnkap2I3ltuLGN19GIFoABa8XIPhXtbQIDAQABo0Ew
-PzAeBgNVHREEFzAVghN0ZXN0Z3UucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQwKdDx
-5NCyLEP4EiCnI49AdPCJNTANBgkqhkiG9w0BAQUFAAOCAQEAMhDQdkJ+oFVKylVM
-LH9AlRmQlC0uqqaZfPECYwepQ08sAb1f6H3OGS8VfHB0PGrMlSgtu3mJImB3LZ+h
-Du69XL+oQV9qr4XNUYhUXAPXkbiojcUEy2WrJ2kEf3GrNomUm234fLu8WEhDV4iU
-l6EOZqEFS5sUtHpQEkW6ITn7MJH+/g412nbxtNRsVCbaEf8jX6n3qG93xyilOgJ3
-cpCuEjbgpDdWe3DPCrL9Kn4ab88aoblJVmjfH4t6t6TMc+zskhKXiQUGogGxzol3
-MSKIqXKgkSbbCtsduu3LvzmWV1r9U8J1QN7BSz7XBjqHvXgxDQzYMFr1SHtIKmN5
-v3gw1w==
-</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgu.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 01222231..83159626 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -111,17 +111,14 @@
   <xi:include href="swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-stable.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test-ki.pingpong.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-lnu-employee-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-lnu-student-sp.xml"/>
-  <xi:include href="swamid-2.0/pingpong.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sdauth.sciencedirect.com-.xml"/>
   <xi:include href="swamid-2.0/wiki.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/lartorget.sll.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hr.liu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-8087-sp.xml"/>
   <xi:include href="swamid-2.0/activate-test.du.se-shibboleth.xml"/>
@@ -139,8 +136,6 @@
   <xi:include href="swamid-2.0/produktwebb.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/activate.du.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tools.kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml"/>
-  <xi:include href="swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/webkonto.student.hig.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogon.ltu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml"/>
@@ -192,8 +187,6 @@
   <xi:include href="swamid-2.0/play.fhs.se.xml"/>
   <xi:include href="swamid-2.0/play.ltu.se.xml"/>
   <xi:include href="swamid-2.0/test.bils.se-auth-metadata.xml"/>
-  <xi:include href="swamid-2.0/gih.pingpong.se-Shibboleth.sso-Metadata.xml"/>
-  <xi:include href="swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/daisy.ict.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/7t.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/nyainloggning.hv.se-shibboleth.xml"/>
@@ -236,7 +229,6 @@
   <xi:include href="swamid-2.0/www.start.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www.student.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/dev.play.sunet.se.xml"/>
-  <xi:include href="swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/gul.gu.se-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml"/>
   <xi:include href="swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -315,9 +307,7 @@
   <xi:include href="swamid-2.0/redcap.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/redcap.tst.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml"/>
-  <xi:include href="swamid-2.0/test-rkh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/rkh.pingpong.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.ifmsa.se-spp.xml"/>
   <xi:include href="swamid-2.0/dev.valda.uhr.se-shibboleth.xml"/>
@@ -347,7 +337,6 @@
   <xi:include href="swamid-2.0/hhs-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/his-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/app.ub.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test-lartorget.sll.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/devpassport.lu.se-activateaccount-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portalmiun.onricoh.se-shibboleth.xml"/>
@@ -399,8 +388,6 @@
   <xi:include href="swamid-2.0/se.timeedit.net-fhs-staff.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-fhs-stud.xml"/>
   <xi:include href="swamid-2.0/ths.instructure.com-saml2.xml"/>
-  <xi:include href="swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/slltest2.luvit.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/stillalive.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/konto.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/filesender.sunet.se-shibboleth.xml"/>
author	Johan Wassberg <jocar@sunet.se>	2022-08-22 14:39:13 +0200
committer	Johan Wassberg <jocar@sunet.se>	2022-08-22 14:39:13 +0200
commit	a9bc2da1e866c85e67884efc2f78207253a0af17 (patch)
tree	8d3f2c029b6ca0eeaac15e3e3901d5e2c749631f
parent	2814aee3795ac54fa53c1a6f9f1b7dada1fc4381 (diff)