From e65ed5e38ff69cb4bedf3dadecf79b6e3183e721 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Mon, 30 May 2022 10:36:59 +0200
Subject: SWAMID-817, Removed 2 old IdP:s from vr.se

---
 swamid-2.0/swamid.vr.se-idp-shibboleth.xml     | 213 -------------------------
 swamid-2.0/swamidtest.vr.se-idp-shibboleth.xml | 202 -----------------------
 swamid-idp-2.0.mxml                            |   1 -
 swamid-testing-idp-1.0.mxml                    |   1 -
 4 files changed, 417 deletions(-)
 delete mode 100644 swamid-2.0/swamid.vr.se-idp-shibboleth.xml
 delete mode 100644 swamid-2.0/swamidtest.vr.se-idp-shibboleth.xml

diff --git a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
deleted file mode 100644
index 65a39018..00000000
--- a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,213 +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://swamid.vr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-06-02T13:35:22Z">
-      <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" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" 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://swamid.vr.se/idp/shibboleth">
-    <Extensions>
-      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet (gammal)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">The Swedish Research Council (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">vr vetenskapsrådet vrpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">vr the+swedish+research+council vrpunktse</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>vr.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
-NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAInY7L5a+yKOLzFrpMDV2298fF8a2F+y4825
-IKw5+hT4PwggJhDrVNm38VAKwxcxMha7+quAr6Q8ByQNBCOqNzLsTtgsmWFhQ9xH
-MU1P9oUHojq7Aey2FinuZZnaBE8JD0R5mo1P3CEBup0NnEqwn/lgdKNulTj4ban9
-bEuOe2uJfIF2T1tOMoLPSVGUfmyXD4dBbhFkmAmdCakQqW98+MUUu2lirCmeD14e
-jpBalmyTQ+sGkHuQqe1BUYAi6bq34FwbJTy2vB8fEpA+VGKPsfSpPEnAes0L5EI6
-Bew7KF02fPvlEAlkxG6nomO6nyp4BLNGAkGItc04DqpaYEZl7DsCAwEAAaNfMF0w
-HQYDVR0OBBYEFENgbwatWUlCeh0R6kmOICOMgacUMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAG+jt0/1LgFkA1RkiaL6IkngsZaVAo7Cv9dY/BlpmWca
-CKFZUH/BC5aG30yOtJOruFsrYQ9TyhA4ey6yF2ah9pU5VkBqi2at3CwrQeY3PGVZ
-vE9QvWWqj1XZY1kv65s4fNTi7GK9vxVn0Xln1A90aWpGsyUN89wBPo7fZLO0M7Lu
-r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
-UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
-spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
-MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjcG5ieiKa7dnFkPwgvSYBwx4ZjYGymzbT8wR
-tPvGUMGFHteFQllaj6l8fDIFzjLPLEDx1AF2Y42gn+vU0pOWu2XIuuX2Ah0MeCVZ
-bczYFvmetfguY2uSeoVkYeiBJaFlCkfY55e/FbRR9XTH5JFRtM2hu7m7mmti6d1o
-kOngUzujyDNplun6Yhx1N/SxpJJlCT5KKzMAlH4A/No2vreqJxwxcVlsUDf/3ENq
-/SELElcuSb+yZ7bNnYfrjfu4zBNuO4ljo4I65GrNlBqMfqb4yu+Xe8uiNunWZJOf
-6+CsHhdxLm3d8uphaT1mxhTDX5Ejn8QYKSV6MYY2sv1LDNaiWQIDAQABo18wXTAd
-BgNVHQ4EFgQUpEiIxHvDKchdVtCsToexB9EPQVIwPAYDVR0RBDUwM4IMc3dhbWlk
-LnZyLnNlhiNodHRwczovL3N3YW1pZC52ci5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAMboAmcD8EC4uWjsxeVNXxeY3HsMsrxSGvthEf1Gc3I9h
-9GAnlxpt4MPNhvN5w+jLg4cNmSZip2lTncF2muOFDFg+o/D4LFlm03Jpyn2ofK5D
-pZqZGoZ97M+0mltEjrqegSwTs4aOoeMZsndzD0F3ars7pgCBPu+lxW7sSzGMuppg
-ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
-SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
-KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
-NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK7lDfcuX9cNY6dp5yLAz9ijP8X6wRCDjKNU
-65oRPXWweNYGsgDEZ+BvIYaou2/zunP1yoSZkQPJA51NJJ67GU0v8z/l0npgCGl4
-oOXofoVdl/7+nhUxgXADVBscsQVfaANl646YjSQhv4z/J0dbu0kGAPfy1WLOhmyL
-52ghwMRYb2T23q6bjGgF9KGVQ5m9u6PrZnyI7sPJQaJZGVA/2r/LkCIMI5tl/HyN
-zSI4jRjk/GA0LHagBopChjX9tAk+QYFWzAy7XpK5tuRYVHpPzN20FRfURzmSxlax
-3nOuFfh6uNzKjGopPR/rJWxR06Dn/nLRBBxXxfJbCGy1YNcv5x8CAwEAAaNfMF0w
-HQYDVR0OBBYEFJ2p67r4xaqD+V/RCoxrlRrPoObaMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAC6AZRu2jtSoQLI+kUZTM9Tp8LoLULuKHlVcxyg35MoW
-qX2YFx0iDzKliK3/Kvg6GIVoEBCHCBQKfM7vuhKOWB8I5DWsDdNeWtTQpoNNzg67
-zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
-/1ZVztspUK+Rcth6YKxxndDjk7SLNv0Em2X1NDAssRChdfs2+NNxaJgyaPcsusU5
-mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
-ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.vr.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.vr.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.vr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
-NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAInY7L5a+yKOLzFrpMDV2298fF8a2F+y4825
-IKw5+hT4PwggJhDrVNm38VAKwxcxMha7+quAr6Q8ByQNBCOqNzLsTtgsmWFhQ9xH
-MU1P9oUHojq7Aey2FinuZZnaBE8JD0R5mo1P3CEBup0NnEqwn/lgdKNulTj4ban9
-bEuOe2uJfIF2T1tOMoLPSVGUfmyXD4dBbhFkmAmdCakQqW98+MUUu2lirCmeD14e
-jpBalmyTQ+sGkHuQqe1BUYAi6bq34FwbJTy2vB8fEpA+VGKPsfSpPEnAes0L5EI6
-Bew7KF02fPvlEAlkxG6nomO6nyp4BLNGAkGItc04DqpaYEZl7DsCAwEAAaNfMF0w
-HQYDVR0OBBYEFENgbwatWUlCeh0R6kmOICOMgacUMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAG+jt0/1LgFkA1RkiaL6IkngsZaVAo7Cv9dY/BlpmWca
-CKFZUH/BC5aG30yOtJOruFsrYQ9TyhA4ey6yF2ah9pU5VkBqi2at3CwrQeY3PGVZ
-vE9QvWWqj1XZY1kv65s4fNTi7GK9vxVn0Xln1A90aWpGsyUN89wBPo7fZLO0M7Lu
-r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
-UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
-spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
-MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjcG5ieiKa7dnFkPwgvSYBwx4ZjYGymzbT8wR
-tPvGUMGFHteFQllaj6l8fDIFzjLPLEDx1AF2Y42gn+vU0pOWu2XIuuX2Ah0MeCVZ
-bczYFvmetfguY2uSeoVkYeiBJaFlCkfY55e/FbRR9XTH5JFRtM2hu7m7mmti6d1o
-kOngUzujyDNplun6Yhx1N/SxpJJlCT5KKzMAlH4A/No2vreqJxwxcVlsUDf/3ENq
-/SELElcuSb+yZ7bNnYfrjfu4zBNuO4ljo4I65GrNlBqMfqb4yu+Xe8uiNunWZJOf
-6+CsHhdxLm3d8uphaT1mxhTDX5Ejn8QYKSV6MYY2sv1LDNaiWQIDAQABo18wXTAd
-BgNVHQ4EFgQUpEiIxHvDKchdVtCsToexB9EPQVIwPAYDVR0RBDUwM4IMc3dhbWlk
-LnZyLnNlhiNodHRwczovL3N3YW1pZC52ci5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAMboAmcD8EC4uWjsxeVNXxeY3HsMsrxSGvthEf1Gc3I9h
-9GAnlxpt4MPNhvN5w+jLg4cNmSZip2lTncF2muOFDFg+o/D4LFlm03Jpyn2ofK5D
-pZqZGoZ97M+0mltEjrqegSwTs4aOoeMZsndzD0F3ars7pgCBPu+lxW7sSzGMuppg
-ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
-SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
-KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
-NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK7lDfcuX9cNY6dp5yLAz9ijP8X6wRCDjKNU
-65oRPXWweNYGsgDEZ+BvIYaou2/zunP1yoSZkQPJA51NJJ67GU0v8z/l0npgCGl4
-oOXofoVdl/7+nhUxgXADVBscsQVfaANl646YjSQhv4z/J0dbu0kGAPfy1WLOhmyL
-52ghwMRYb2T23q6bjGgF9KGVQ5m9u6PrZnyI7sPJQaJZGVA/2r/LkCIMI5tl/HyN
-zSI4jRjk/GA0LHagBopChjX9tAk+QYFWzAy7XpK5tuRYVHpPzN20FRfURzmSxlax
-3nOuFfh6uNzKjGopPR/rJWxR06Dn/nLRBBxXxfJbCGy1YNcv5x8CAwEAAaNfMF0w
-HQYDVR0OBBYEFJ2p67r4xaqD+V/RCoxrlRrPoObaMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAC6AZRu2jtSoQLI+kUZTM9Tp8LoLULuKHlVcxyg35MoW
-qX2YFx0iDzKliK3/Kvg6GIVoEBCHCBQKfM7vuhKOWB8I5DWsDdNeWtTQpoNNzg67
-zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
-/1ZVztspUK+Rcth6YKxxndDjk7SLNv0Em2X1NDAssRChdfs2+NNxaJgyaPcsusU5
-mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
-ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">VR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Research Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Robert Chrudina</SurName>
-    <EmailAddress>mailto:robert.chrudina@tieto.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/swamidtest.vr.se-idp-shibboleth.xml b/swamid-2.0/swamidtest.vr.se-idp-shibboleth.xml
deleted file mode 100644
index 6765d458..00000000
--- a/swamid-2.0/swamidtest.vr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,202 +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://swamidtest.vr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-04-22T11:27:25Z">
-      <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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" 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://swamidtest.vr.se/idp/shibboleth">
-    <Extensions>
-      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test IDP på Vetenskapsrådet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">The Swedish Research Council Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IDP at Swedish Research Council</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="122">https://www.vr.se/logo_small</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">vr test vetenskapsrådet vrpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">vr test the+swedish+research+council vrpunktse</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>vr.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
-NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAInY7L5a+yKOLzFrpMDV2298fF8a2F+y4825
-IKw5+hT4PwggJhDrVNm38VAKwxcxMha7+quAr6Q8ByQNBCOqNzLsTtgsmWFhQ9xH
-MU1P9oUHojq7Aey2FinuZZnaBE8JD0R5mo1P3CEBup0NnEqwn/lgdKNulTj4ban9
-bEuOe2uJfIF2T1tOMoLPSVGUfmyXD4dBbhFkmAmdCakQqW98+MUUu2lirCmeD14e
-jpBalmyTQ+sGkHuQqe1BUYAi6bq34FwbJTy2vB8fEpA+VGKPsfSpPEnAes0L5EI6
-Bew7KF02fPvlEAlkxG6nomO6nyp4BLNGAkGItc04DqpaYEZl7DsCAwEAAaNfMF0w
-HQYDVR0OBBYEFENgbwatWUlCeh0R6kmOICOMgacUMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAG+jt0/1LgFkA1RkiaL6IkngsZaVAo7Cv9dY/BlpmWca
-CKFZUH/BC5aG30yOtJOruFsrYQ9TyhA4ey6yF2ah9pU5VkBqi2at3CwrQeY3PGVZ
-vE9QvWWqj1XZY1kv65s4fNTi7GK9vxVn0Xln1A90aWpGsyUN89wBPo7fZLO0M7Lu
-r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
-UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
-spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
-MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjcG5ieiKa7dnFkPwgvSYBwx4ZjYGymzbT8wR
-tPvGUMGFHteFQllaj6l8fDIFzjLPLEDx1AF2Y42gn+vU0pOWu2XIuuX2Ah0MeCVZ
-bczYFvmetfguY2uSeoVkYeiBJaFlCkfY55e/FbRR9XTH5JFRtM2hu7m7mmti6d1o
-kOngUzujyDNplun6Yhx1N/SxpJJlCT5KKzMAlH4A/No2vreqJxwxcVlsUDf/3ENq
-/SELElcuSb+yZ7bNnYfrjfu4zBNuO4ljo4I65GrNlBqMfqb4yu+Xe8uiNunWZJOf
-6+CsHhdxLm3d8uphaT1mxhTDX5Ejn8QYKSV6MYY2sv1LDNaiWQIDAQABo18wXTAd
-BgNVHQ4EFgQUpEiIxHvDKchdVtCsToexB9EPQVIwPAYDVR0RBDUwM4IMc3dhbWlk
-LnZyLnNlhiNodHRwczovL3N3YW1pZC52ci5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAMboAmcD8EC4uWjsxeVNXxeY3HsMsrxSGvthEf1Gc3I9h
-9GAnlxpt4MPNhvN5w+jLg4cNmSZip2lTncF2muOFDFg+o/D4LFlm03Jpyn2ofK5D
-pZqZGoZ97M+0mltEjrqegSwTs4aOoeMZsndzD0F3ars7pgCBPu+lxW7sSzGMuppg
-ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
-SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
-KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
-NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK7lDfcuX9cNY6dp5yLAz9ijP8X6wRCDjKNU
-65oRPXWweNYGsgDEZ+BvIYaou2/zunP1yoSZkQPJA51NJJ67GU0v8z/l0npgCGl4
-oOXofoVdl/7+nhUxgXADVBscsQVfaANl646YjSQhv4z/J0dbu0kGAPfy1WLOhmyL
-52ghwMRYb2T23q6bjGgF9KGVQ5m9u6PrZnyI7sPJQaJZGVA/2r/LkCIMI5tl/HyN
-zSI4jRjk/GA0LHagBopChjX9tAk+QYFWzAy7XpK5tuRYVHpPzN20FRfURzmSxlax
-3nOuFfh6uNzKjGopPR/rJWxR06Dn/nLRBBxXxfJbCGy1YNcv5x8CAwEAAaNfMF0w
-HQYDVR0OBBYEFJ2p67r4xaqD+V/RCoxrlRrPoObaMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAC6AZRu2jtSoQLI+kUZTM9Tp8LoLULuKHlVcxyg35MoW
-qX2YFx0iDzKliK3/Kvg6GIVoEBCHCBQKfM7vuhKOWB8I5DWsDdNeWtTQpoNNzg67
-zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
-/1ZVztspUK+Rcth6YKxxndDjk7SLNv0Em2X1NDAssRChdfs2+NNxaJgyaPcsusU5
-mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
-ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamidtest.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamidtest.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamidtest.vr.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamidtest.vr.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamidtest.vr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
-NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAInY7L5a+yKOLzFrpMDV2298fF8a2F+y4825
-IKw5+hT4PwggJhDrVNm38VAKwxcxMha7+quAr6Q8ByQNBCOqNzLsTtgsmWFhQ9xH
-MU1P9oUHojq7Aey2FinuZZnaBE8JD0R5mo1P3CEBup0NnEqwn/lgdKNulTj4ban9
-bEuOe2uJfIF2T1tOMoLPSVGUfmyXD4dBbhFkmAmdCakQqW98+MUUu2lirCmeD14e
-jpBalmyTQ+sGkHuQqe1BUYAi6bq34FwbJTy2vB8fEpA+VGKPsfSpPEnAes0L5EI6
-Bew7KF02fPvlEAlkxG6nomO6nyp4BLNGAkGItc04DqpaYEZl7DsCAwEAAaNfMF0w
-HQYDVR0OBBYEFENgbwatWUlCeh0R6kmOICOMgacUMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAG+jt0/1LgFkA1RkiaL6IkngsZaVAo7Cv9dY/BlpmWca
-CKFZUH/BC5aG30yOtJOruFsrYQ9TyhA4ey6yF2ah9pU5VkBqi2at3CwrQeY3PGVZ
-vE9QvWWqj1XZY1kv65s4fNTi7GK9vxVn0Xln1A90aWpGsyUN89wBPo7fZLO0M7Lu
-r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
-UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
-spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
-MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjcG5ieiKa7dnFkPwgvSYBwx4ZjYGymzbT8wR
-tPvGUMGFHteFQllaj6l8fDIFzjLPLEDx1AF2Y42gn+vU0pOWu2XIuuX2Ah0MeCVZ
-bczYFvmetfguY2uSeoVkYeiBJaFlCkfY55e/FbRR9XTH5JFRtM2hu7m7mmti6d1o
-kOngUzujyDNplun6Yhx1N/SxpJJlCT5KKzMAlH4A/No2vreqJxwxcVlsUDf/3ENq
-/SELElcuSb+yZ7bNnYfrjfu4zBNuO4ljo4I65GrNlBqMfqb4yu+Xe8uiNunWZJOf
-6+CsHhdxLm3d8uphaT1mxhTDX5Ejn8QYKSV6MYY2sv1LDNaiWQIDAQABo18wXTAd
-BgNVHQ4EFgQUpEiIxHvDKchdVtCsToexB9EPQVIwPAYDVR0RBDUwM4IMc3dhbWlk
-LnZyLnNlhiNodHRwczovL3N3YW1pZC52ci5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAMboAmcD8EC4uWjsxeVNXxeY3HsMsrxSGvthEf1Gc3I9h
-9GAnlxpt4MPNhvN5w+jLg4cNmSZip2lTncF2muOFDFg+o/D4LFlm03Jpyn2ofK5D
-pZqZGoZ97M+0mltEjrqegSwTs4aOoeMZsndzD0F3ars7pgCBPu+lxW7sSzGMuppg
-ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
-SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
-KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
-NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK7lDfcuX9cNY6dp5yLAz9ijP8X6wRCDjKNU
-65oRPXWweNYGsgDEZ+BvIYaou2/zunP1yoSZkQPJA51NJJ67GU0v8z/l0npgCGl4
-oOXofoVdl/7+nhUxgXADVBscsQVfaANl646YjSQhv4z/J0dbu0kGAPfy1WLOhmyL
-52ghwMRYb2T23q6bjGgF9KGVQ5m9u6PrZnyI7sPJQaJZGVA/2r/LkCIMI5tl/HyN
-zSI4jRjk/GA0LHagBopChjX9tAk+QYFWzAy7XpK5tuRYVHpPzN20FRfURzmSxlax
-3nOuFfh6uNzKjGopPR/rJWxR06Dn/nLRBBxXxfJbCGy1YNcv5x8CAwEAAaNfMF0w
-HQYDVR0OBBYEFJ2p67r4xaqD+V/RCoxrlRrPoObaMDwGA1UdEQQ1MDOCDHN3YW1p
-ZC52ci5zZYYjaHR0cHM6Ly9zd2FtaWQudnIuc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAC6AZRu2jtSoQLI+kUZTM9Tp8LoLULuKHlVcxyg35MoW
-qX2YFx0iDzKliK3/Kvg6GIVoEBCHCBQKfM7vuhKOWB8I5DWsDdNeWtTQpoNNzg67
-zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
-/1ZVztspUK+Rcth6YKxxndDjk7SLNv0Em2X1NDAssRChdfs2+NNxaJgyaPcsusU5
-mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
-ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamidtest.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">VR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Research Council Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
-  </Organization>
-</md:EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 8fa06f48..558d6650 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -9,7 +9,6 @@
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/sts.vinnova.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.uka.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.ju.se-adfs-services-trust.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 7d9b0923..6cbadadd 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -41,7 +41,6 @@
   <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"/>
-  <xi:include href="swamid-2.0/swamidtest.vr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nya-00.its.umu.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/idp-shibtest.slu.se-idp.xml"/>
   <xi:include href="swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml"/>
-- 
cgit v1.2.3