SWAMID-469 Cleaned up old boxes

6 files changed, 0 insertions, 267 deletions

diff --git a/swamid-2.0/idpaas-dev.swamid.se-Saml2IDP-SWAMIDStaff.xml b/swamid-2.0/idpaas-dev.swamid.se-Saml2IDP-SWAMIDStaff.xml
deleted file mode 100644
index c030d9ee..00000000
--- a/swamid-2.0/idpaas-dev.swamid.se-Saml2IDP-SWAMIDStaff.xml
+++ /dev/null
@@ -1,71 +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://idpaas-dev.swamid.se/Saml2IDP/SWAMIDStaff">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-17T15:01:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idpaas-dev.swamid.se/Saml2IDP/SWAMIDStaff">
-    <saml:Extensions>
-      <shibmd:Scope regexp="false">dev.sunet.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUNET DEV IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET DEV IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Dev system för SUNET-anställdas inloggning</mdui:Description>
-        <mdui:Description xml:lang="en">Dev system for SUNET employees login</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>dev.sunet.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </saml:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>
-MIIENTCCAp2gAwIBAgIUKiVogvjpEjjkRYHwKODAbIYjTcIwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAxMUaWRwYWFzLWRldi5zd2FtaWQuc2UwHhcNMjAwMzE3MTE1
-NTEzWhcNMzAwMzE1MTE1NTEzWjAfMR0wGwYDVQQDExRpZHBhYXMtZGV2LnN3YW1p
-ZC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBANZhDKi3q9Loiu4Y
-3t0ebEEnzJbKYwaR7vYep2H7jR4mjTrr2QSBmWMOLN1XLx6fnwS+ZhPljXRPpKkB
-5BDmJOF7yni1/Q5XU0tnEbZEcMublGjjOOZrhdPYAgbsMWtr9wPFKHnQWy1xmEiy
-oQ5pzogAks62b65xU1XRonySONf6nnn7/L6AMNqekqXFKMfiZIYnv+m4KU5lpT2z
-56uAQ+STGL+NKhWGbqHlim8z2L9KpVgLdtT2dDHir94u4I57jMZEjFsEsh3gX6Dw
-xTRO2FfS+nuAB2wexG14Shq0qjBrM1jbWlnKhIAwsF6SaovVUZdBe9m76pOJX5aX
-5Vc/aEfAtimUUrHE6qSaE9Xe2NJ+gGU5rOrJx7XYdD62vLDaV2iYQ1pWZoYeYlca
-uvJTSpUb6zbmgFiIpSgIIzedhpyvzQjMV1fvFRlpgXMGXb7+BClyZgUIDj7mkezm
-CxAq9p2A9oF/hodVREn8qGLRT2c62rCHt34+GuyOoWBLdmDRHQIDAQABo2kwZzBG
-BgNVHREEPzA9ghRpZHBhYXMtZGV2LnN3YW1pZC5zZYYlaHR0cHM6Ly9pZHBhYXMt
-ZGV2LnN3YW1pZC5zZS9TYW1sMklEUDAdBgNVHQ4EFgQUnctgBYIeC44jG6uPt0lB
-+5zWxo0wDQYJKoZIhvcNAQELBQADggGBAD/XJnf5O/8rF61VzZ8BUGw6ZSBRLeyD
-HFLOkZn8ZZZ34rKrSXde5F2UzemWnPD3rWPfjA7nNtGCC1E0NRu24i9t214KviLb
-NNJV2GGZtdfqB5ZOKW9NlzDJrtJUJBbtSVzudsvo8zqzaL67/Vsb4oUOpsF0LYqE
-M/8cr+s1zyt8JjqfzvkZ4vY6//odPZQ3BZuoodhs5lHjRzb32ddVl91GcRd72uWc
-7q0IP94ZbQmMw5LQVzmwEqkNimfrB9060DfJsjf7unixm36++GcHc/ndyHJsr6I8
-Y8EsBJJ/SVy+u6mTCtSPzXlNL8q16fbPq1e2gr3zle0WzMSC3Yc/oqqFCKN01OUd
-2RfgDqHwAgOStwLYv+5vqN9xCJLFx/UWmqhEKVNByvrgIeKH9o++fCIGMwRp+Qa5
-4AyQY2TxCTYJ3227dMpe2du+oQ93dFz/o9a9QQ8e5y1o1asiuFIErsWcJ3iaWg5E
-3Hyf8ctX21hWS79HxwqhS2wnTo13roy7Nw==
-          </ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpaas-dev.swamid.se/Saml2SP/SWAMIDStaff/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas-dev.swamid.se/Saml2SP/SWAMIDStaff/sso/post"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SUNET DEV IdP</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SUNET DEV IdP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/idpaas-dev.swamid.se-Saml2SP-sp.xml b/swamid-2.0/idpaas-dev.swamid.se-Saml2SP-sp.xml
deleted file mode 100644
index 0ae81b13..00000000
--- a/swamid-2.0/idpaas-dev.swamid.se-Saml2SP-sp.xml
+++ /dev/null
@@ -1,69 +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" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata          sstc-saml-schema-metadata-2.0.xsd          urn:mace:shibboleth:metadata:1.0          shibboleth-metadata-1.0.xsd          http://www.w3.org/2000/09/xmldsig#          xmldsig-core-schema.xsd" entityID="https://idpaas-dev.swamid.se/Saml2SP/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-17T15:11:51Z">
-      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sunets DEV COmanage IDP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sunet's DEV COmanage IDP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">COmanage DEV IDP hos Sunet</mdui:Description>
-        <mdui:Description xml:lang="en">COmanage DEV IDP at Sunet</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEODCCAqCgAwIBAgIUF1MxCoRJ5wBjELC3i3QRReJ7THowDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAxMUaWRwYWFzLWRldi5zd2FtaWQuc2UwHhcNMjAwMzE3MTE1
-NzEzWhcNMzAwMzE1MTE1NzEzWjAfMR0wGwYDVQQDExRpZHBhYXMtZGV2LnN3YW1p
-ZC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALMv5tOoWMihQXqa
-rkpkK+RiWZpIxxx5U461Ju0oQV/j2ZQbk/W4JxGIvxmPqhnI6wVSODg1KzA4CFwO
-YQ3ATe5iZ4BjjVElVrzTxrtdI2sV//AjsNU3CVyi6SZcYW+w5xn+dro29Y9RGYAm
-wTpLg+AMHh0SkRARpQQkHmp1qDPz67d+X5Ukn4Ktm5Ld/Sjw7bGBhmBInPlRPQpu
-tFl+Mw9s0YYNrRGSvI9WdikMBhJjTo0sZEnWH/L1UvdwwtHg/jy4Wupx2UuhtTaH
-c2Yu/EkSHQxLyboCAEyKrscQM0I1eOSxDZtqoCfi9r1FoMJclHLL5YKaGcWhAuqA
-8MiB57dB1uNvF1BvQMhAjh+I2XJYntkMEti3aQuGaAYSykmZ/f0bHsJ0D1H9aeTG
-eS7qMNiAmw0zBSlapZYSUq4UcxwcR7U9KD8phbB2NNooEMmECxvt1HvWK2Lc64c0
-fVQS59/c2IA5V4OF9L0lvUJz8AkVCBM6YR69ztplqadppj8vgQIDAQABo2wwajBJ
-BgNVHREEQjBAghRpZHBhYXMtZGV2LnN3YW1pZC5zZYYoaHR0cHM6Ly9pZHBhYXMt
-ZGV2LnN3YW1pZC5zZS9TYW1sMklEUC9zcDAdBgNVHQ4EFgQUrxJhLuIGZrNsRBew
-0hyUgvM/w0YwDQYJKoZIhvcNAQELBQADggGBAGzRKY3oOSbH0/lvIOvlT9Em9anc
-hgYD4o7inWtWA0I9cb+ksdv0gplLg4aYs+YfSOkUt2VjtBDOUxZIZ96bBjs3yBxR
-OviqQwwPCIoxpfeTYKEKxRslZInf4Smj+YOctsBBt3a6ilHiL8HSKLqa2w/bRHEq
-NOwHxneRYTq1XwRjRIVSLAnRhKtgEMSWUP5FIRSTu0yi6H8tWiQsnk2fYD2VW9UF
-/2rAVpEPyUE3C5BQTk+dxY/WQ6ZgF4tDpe8HLAL4UG7EOfb6/WBfmAnB0k18N6kv
-ZReELPLnpto9DIlRjt4z7Fu57uJU9DJeiMu3uNLJ6qsgXoe3JOenUMmhpgrdQ5ZM
-nL/z4GEaGYqt6mAg6NFAgygsXX3HGmxaTSnjcD6j4aBSZtaOOWFc3sXJMVBMcqp5
-aCOYfUywe8jw2aSSyU94ED8BNT4vPXtbUnxKreEZ3NHacyAirtjydzI+6cK+BVzd
-9b8lEeryobZGQV7iuGcUnnwhO/CxEphk3vqmpw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas-dev.swamid.se/Saml2SP/acs/post" index="1"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SUNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Technical</GivenName>
-    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
deleted file mode 100644
index cc93869d..00000000
--- a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
+++ /dev/null
@@ -1,123 +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://sirtfi-check.swamid.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-09T15:47:32Z">
-      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/nordu.net"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/nordu.net" index="1"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/kalmar2" index="2"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/feide"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/haka.funet.fi"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/haka.funet.fi" index="3"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/idp.funet.fi"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/eduid-dev"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/eduid"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/unitedid"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/skolfederation"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/skolfederation" index="4"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io" index="6"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/md.nordu.net"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/md.nordu.net" index="7"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="8"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/loopback"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/DS/loopback" index="9"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/box-idp.sunet.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://sirtfi-check.swamid.se/Shibboleth.sso/Login/box-idp.nordu.net"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/socialproxy"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/openidp"/>
-      <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://sirtfi-check.swamid.se/Shibboleth.sso/Login/necs.sll.se"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMIDs SIRTFI IdP-test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID SIRTFI IdP certification tester</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Verktyg för att testa om en IdP har markering för REFEDS SIRTFI i metadata</mdui:Description>
-        <mdui:Description xml:lang="en">REFEDS SIRTFI IdP certification testing tool</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.sunet.se/swamid/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sunet.se/about-sunet/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>sirtfi-check.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sirtfi-check.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAKz5KgERlzvdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnNpcnRmaS1jaGVjay5zd2FtaWQuc2UwHhcNMTcxMTA5MTQxMTEzWhcNMjcx
-MTA3MTQxMTEzWjAhMR8wHQYDVQQDExZzaXJ0ZmktY2hlY2suc3dhbWlkLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuRrUuaORIiD/qZnLVmTFkdD1
-40cl4449uRK6Jed2ruYTpgkt9HLWei4qC5LMm+0+X42Dujqdz2eBl/c9/fLm7E5H
-EN+EKlwN2xWn8Xs6hNj5v3Iyb+wi3s+auGIKjfyyS1oRWWmc9Hr9b0lcPATLj4t7
-jZwCAzFJZCoi9Vlao5R6aM5RI00e2jcDJVyllSpHk8Q2I+4WDGt2VRpyr+PY+uWp
-6/gkp5Q1mdFHHtl1F6l8pRI1zrgi4+/QvL1K/o4qajbpefn+ycpi22pIpAbJoP0y
-kcS52+ld4PQePSIgoEAUVKS2W2Zhy492tmylyG2qTmLJUVd/3y3K7zgAvMmydwID
-AQABo0QwQjAhBgNVHREEGjAYghZzaXJ0ZmktY2hlY2suc3dhbWlkLnNlMB0GA1Ud
-DgQWBBSKZkYCRec3Ztf6W/mYDqvjR9ketTANBgkqhkiG9w0BAQUFAAOCAQEAEral
-9hz8CYNwBWCAgIumYakHIRlr0SVy6XNSZ5r9Vc2J1eu0dbNFKlrFUbCchWiKDv0v
-pYwrAfMFCHVQlENjo+QHU8E9GNG5Sa4Wavjuq/E74AhPw4bqoB44KAJut8dpBrRA
-gq/lLYCBDIwg0eIg/0e4v0Kxa/CJIMPPopxgDcy+0dTAQJZnlV/E9pFrs+AXmix3
-NPGThE4Jme6uXrz1YFSJaGVTzBE8GrQFou+snTxrEdRus7si7aGK7k1OnU1n7fgD
-MG9CnC6+p+a062EkA8Yh/Kl+tu6dB1YwZ8GOiZ++Xn2vc5rjxykv5qkaHk+E1UlY
-JRf9VO1D1PoLKLI1hA==
-</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://sirtfi-check.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 30eb05ec..8530fa1a 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -12,7 +12,6 @@
   <xi:include href="swamid-2.0/secure.urkund.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
-  <xi:include href="swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml"/>
   <xi:include href="swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/graylog.nordu.net-shibboleth.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 42d50d89..fe653040 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -168,7 +168,6 @@
   <xi:include href="swamid-2.0/weblogon.ltu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml"/>
-  <xi:include href="swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mfa-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -320,7 +319,6 @@
   <xi:include href="swamid-2.0/comanage-dev.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml"/>
   <xi:include href="swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml"/>
-  <xi:include href="swamid-2.0/idpaas-dev.swamid.se-Saml2SP-sp.xml"/>
   <xi:include href="swamid-2.0/registry-test.swamid.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/test.play.rkh.se.xml"/>
   <xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 1cb34cc4..138be279 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -40,7 +40,6 @@
   <xi:include href="swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml"/>
   <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml"/>
-  <xi:include href="swamid-2.0/idpaas-dev.swamid.se-Saml2IDP-SWAMIDStaff.xml"/>
   <xi:include href="swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/idp.test.sunet.se-idp.xml"/>