SWAMID-1176: obsolete entites removed

author: Fredrik Domeij <fredrik.domeij@umu.se> 2022-08-18 16:28:46 +0200
committer: Fredrik Domeij <fredrik.domeij@umu.se> 2022-08-18 16:28:46 +0200
commit: a57ac64db8df42885bba56966df098f789e3d9ef (patch)
tree: df1e645f3e5f5cea33f28ed7b8eb8672aa179580
parent: 6e0569dd414c00c0c7e3bad0a9683b97118148d5 (diff)
17 files changed, 0 insertions, 960 deletions
diff --git a/swamid-2.0/bhb-00.its.umu.se-gui-sp.xml b/swamid-2.0/bhb-00.its.umu.se-gui-sp.xml
deleted file mode 100644
index 0e3568be..00000000
--- a/swamid-2.0/bhb-00.its.umu.se-gui-sp.xml
+++ /dev/null
@@ -1,55 +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://bhb-00.its.umu.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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 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://bhb-00.its.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>bhb-00.its.umu.se</ds:KeyName>
-        <ds:KeyName>https://bhb-00.its.umu.se/gui-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bhb-00.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJALFNCD6ZIL+1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWJoYi0wMC5pdHMudW11LnNlMB4XDTEyMTEyMzA3MjkwM1oXDTIyMTEyMTA3
-MjkwM1owHDEaMBgGA1UEAxMRYmhiLTAwLml0cy51bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC7EhvwiGCHhrTgZmKz7QWnM2ZKpzqV7Z4ytw7D
-+XeXIkC7u0Svvya/Wu61ebgDV0I3K2r9mr2QOkwRW2Cod/Jh1bjCeVaOrGQ3P7be
-HQqWrMSPFibb0fO+tYwsAGRgwbsDsVADu4ZAivSkDO6EEmeUH3a8nm8CgycAA6oB
-OPn8j3ejLcBGhMJMHnOxGa/cTYJGd6skeoz7SzFdhtJYLiXRKVOw8aKHydRxbiZ7
-voy1z4d7biF+VgSO2mn1BPK1SsEMOEN8nVRKF3hNZowM3BboDL2RnbJr1N5uHdOD
-a34hRDOOXZep/nrTMgCBbsXlWYNPPx1WkkIQfsww8nmVRS9dAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEWJoYi0wMC5pdHMudW11LnNlhiBodHRwczovL2JoYi0wMC5pdHMu
-dW11LnNlL2d1aS1zcDAdBgNVHQ4EFgQUOHCYgAjy9Oi6g786AUUNx6XfnIUwDQYJ
-KoZIhvcNAQEFBQADggEBAE0ytkoIA3Z3PiQ3hole4TlVfMJVz0YIyRqCxhUrFK8z
-kZzamdfJG4t+SqKOKzD4oRGd8n8ci2aUb17XuUjLhBJFpOoGTCZ/B6LYzpZsdgbe
-OGkkzw4ewuqUtDQ/ItbipTTDGijCaZ9/6jvP7AMylt+Fm1RHGj9hRBcuLuGyttZq
-Qy8DxHBvcyjkDy2TSh1gKl2jD/0d5uUexalcZe9uDgXH24TRjc8FLNDpvA5Izqpk
-WeE6dUoIIcLMXBYTVTZaDj1epAlAwjLHBfWN3aTLYtbHxzNvmJnXWupFF4asDy0k
-T4JmWVuahf55521sNRWAb9Sx/6dKHVzXgLLg7EsJVAA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bhb-00.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bhb-00.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bhb-00.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bhb-00.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bhb-00.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bhb-00.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/bhb-00.its.umu.se-user-idp.xml b/swamid-2.0/bhb-00.its.umu.se-user-idp.xml
deleted file mode 100644
index 8f9ad8d6..00000000
--- a/swamid-2.0/bhb-00.its.umu.se-user-idp.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://bhb-00.its.umu.se/user-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol 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://bhb-00.its.umu.se/user-idp">
-    <Extensions>
-      <shibmd:Scope regexp="false">bhb.its.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBgTCCASugAwIBAgIJANmK5d7szq6eMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWJoYi0wMC5pdHMudW11LnNlMB4XDTEyMTEyMzA3MjgzMVoXDTIyMTEyMTA3MjgzMVowHDEaMBgGA1UEAwwRYmhiLTAwLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAx6lDKSbXwgN19SARCQMM/tvzEqP6QSGFccv0rgw6ef8aKVp52lTAoB05bXiZHXCsZsasE9GtPkyuMx2S7bscFQIDAQABo1AwTjAdBgNVHQ4EFgQUtoJkLhWFVGovAl8MZfjyooPm0EUwHwYDVR0jBBgwFoAUtoJkLhWFVGovAl8MZfjyooPm0EUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJubaw1VrzPRgRBYapaY7mbIHwxzRuCislNOXB39Xv7y3qgUaT0jh3khqZiZMkrnT8YB0j4+CsmOfKl8Xtpqiyc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bhb-00.its.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bhb-00.its.umu.se:8445/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://bhb-00.its.umu.se:8444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bhb-00.its.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bhb-00.its.umu.se:8444/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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">bhb.its.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBgTCCASugAwIBAgIJANmK5d7szq6eMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWJoYi0wMC5pdHMudW11LnNlMB4XDTEyMTEyMzA3MjgzMVoXDTIyMTEyMTA3MjgzMVowHDEaMBgGA1UEAwwRYmhiLTAwLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAx6lDKSbXwgN19SARCQMM/tvzEqP6QSGFccv0rgw6ef8aKVp52lTAoB05bXiZHXCsZsasE9GtPkyuMx2S7bscFQIDAQABo1AwTjAdBgNVHQ4EFgQUtoJkLhWFVGovAl8MZfjyooPm0EUwHwYDVR0jBBgwFoAUtoJkLhWFVGovAl8MZfjyooPm0EUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJubaw1VrzPRgRBYapaY7mbIHwxzRuCislNOXB39Xv7y3qgUaT0jh3khqZiZMkrnT8YB0j4+CsmOfKl8Xtpqiyc=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bhb-00.its.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bhb-00.its.umu.se:8445/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml b/swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml
deleted file mode 100644
index c6f6c22a..00000000
--- a/swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.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://dwidp.nyautb.its.umu.se/dw-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol 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://dwidp.nyautb.its.umu.se/dw-idp">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.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://dwidp.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.nyautb.its.umu.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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml b/swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml
deleted file mode 100644
index ff7172d9..00000000
--- a/swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.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://expert.nyautb.its.umu.se/ecs-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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 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://expert.nyautb.its.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>expert.nyautb.its.umu.se</ds:KeyName>
-        <ds:KeyName>https://expert.nyautb.its.umu.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=expert.nyautb.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAN7fIb/fmkm4MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGGV4cGVydC5ueWF1dGIuaXRzLnVtdS5zZTAeFw0xMTEyMTkwODIyMTBaFw0y
-MTEyMTYwODIyMTBaMCMxITAfBgNVBAMTGGV4cGVydC5ueWF1dGIuaXRzLnVtdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOaZbjRtU6FFTRTSZpic
-VBUnCwkICq82PhtUh29ZWwv9t+MnykMq+xkRqyX5jaUk4oE2zI9oVbdq0MQr5OPy
-MIJzgkdBp5VwFZKhia2GFrP5q/WOcxLb+z8erWtSFnvrkW2cDor8ZU0oNynawIrH
-SLPQdrsKOG3AiOpFjX+SW7Sq/3+zOO7LfX5l0L/OnSdLnOFT6Dmz7Vjfh+VQYvgI
-0q5kzyEYKdeOds2NanUYOAh6b/Ho+eBXZifDvL7ohklU2WdQ1/g0TW8agH9cMsPR
-znKxepO/l6zYKMTm116MJTcecIjzTZ06ill6ve4JYSKXN8irnrlyeVOzEDCX2Kd0
-Q4kCAwEAAaNvMG0wTAYDVR0RBEUwQ4IYZXhwZXJ0Lm55YXV0Yi5pdHMudW11LnNl
-hidodHRwczovL2V4cGVydC5ueWF1dGIuaXRzLnVtdS5zZS9lY3Mtc3AwHQYDVR0O
-BBYEFOvL0p0RkcuNih0EtIEXNjct2UXfMA0GCSqGSIb3DQEBBQUAA4IBAQBJLBjU
-Dij+Z/dyDbfz51sCNoI4JwPewIfyTnA4aJe1/EsXoWMg5OaXPbDMnzL6F+zmY5r7
-DPmXEdhOH8X8xDHGXOEtrt4CXaPUWGdeQ2y/wFzvbbEzsuzRHTa4rbecEWeoW29E
-AqbFmqOUgcTWvyAderwGZ796AS+p+e8OqLnvnOM4OufAFqrZEua+izEhguAndlaE
-JGkjlkw/PPrnQqss54s4VQSSI4/7VuUL9S66jn1xBbQZXFEMGKVccyt0TWrCpbAa
-FKzVDWLVEwvPerSGFryio+2aEaD17fF5WkBZcqxnQVPJqPl18N+ewxPTpAYf6/5d
-Pg/PxwRl7683LF0B
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/its-jira-test01.its.umu.se-shibboleth.xml b/swamid-2.0/its-jira-test01.its.umu.se-shibboleth.xml
deleted file mode 100644
index 3c9d6075..00000000
--- a/swamid-2.0/its-jira-test01.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://its-jira-test01.its.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-02-01T09:54:34Z">
-      <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <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://its-jira-test01.its.umu.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://its-jira-test01.its.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Jira, ITS, Umeå universitet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jira, ITS, Umeå University (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Jira, ITS, IT-stöd och systemutveckling, Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Jira, ITS, ICT Services and System Development, Umeå University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>its-jira-test01.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=its-jira-test01.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEFTCCAn2gAwIBAgIJAIYEcYnchTfNMA0GCSqGSIb3DQEBCwUAMCUxIzAhBgNV
-BAMTGml0cy1qaXJhLXRlc3QwMS5pdHMudW11LnNlMB4XDTE3MDExODEwNDUxM1oX
-DTI3MDExNjEwNDUxM1owJTEjMCEGA1UEAxMaaXRzLWppcmEtdGVzdDAxLml0cy51
-bXUuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCoV3lWhmY46+dG
-asee3VbT3ORytihzbkPp2HlfWekmJFR9lItFWfCXeAqAgz1l6fi6cl721a/obkpG
-TtQawfV0Lp4aSJEenS2sf4Z5vdlu8crOoebeTDNKTc2xkARh/nN5PikpdedefrKt
-E9GQcuYMozTt4YuaOSWJVvLZ+jICjSdDLU8IAbTTQmctm1GBLSL6UVaIv+h6sqgl
-L4HneOPD2clFFcGHj9wuXpxJjQ47nJeeG1A8N7HElWubLPRw/ZL2CLmuCjZ9BULp
-fLldneJxKcQ/hPnHysJCyZ+qVScfJwrvWfaMIUbWEqjTLSk7ZF+rBgmKjz05HYMq
-hRx9n7P4Sc/ntmvm+6RNscBBJu8N+Jf5Mhle1DJHzq+TROxpZJsxzPvW5FYBR01f
-DDO/f0Dnr5iOaINc5Ig15HPO490Dnk0HaZg/3fWqUdn4E8ecw2yR2qjQz3Gr01Xb
-qnKQTKp5Q8muuvQjGKmT4dx3KPF53PRO1do2hMsKVztRgWYar8ECAwEAAaNIMEYw
-JQYDVR0RBB4wHIIaaXRzLWppcmEtdGVzdDAxLml0cy51bXUuc2UwHQYDVR0OBBYE
-FLN4DgfR5MnXhqL0WMiuE4cRkfHMMA0GCSqGSIb3DQEBCwUAA4IBgQAgEbzWvp99
-2IGp9bIlhAEa9qAa1RpHNWRaFKqh49TmTMaBgPpFKa8N+1cunEIuKevLifW6Q2oq
-91ZQ/n3A8e8Ayvs++zmA/pFNgFMZeP/xNj7D6ZUe3CHA/v146SUaeWroptpb2QSx
-Hi8FEOldo/RcUysTUSCgL6wayjyLAekPFc3Lp0wadZK/cErt5g5NSrlhrU9X08d2
-4SbpcP7UPdb/zJGfj6vQaZjTGaWldg5+czm4+9OxxvkGw8g3lJl8LuGv7dcj6Opv
-OcNbc09eW0FV6IJVwRyXi9e9IzY1XLoL7qQqYWUqlOGfD5gTqWbKKy1DxWEnLgxb
-0SwojtIwaz6X2mQMIquCwBCF9wmGEAfgV8iwbPAAjs9O77ipVj81fkXW586tOunG
-1Z2GQZZPz7/faXpEed2mD+wc3HDZG0RGv0DMoQ8MCP/msq7Y9vPJqIx2PI0U7n3z
-bsrpo09V0+RaiP3xgG3dhPu9Vp9ic057pSHwzNjlfLUVLJAOaWrJVcg=
-</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://its-jira-test01.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://its-jira-test01.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/jira-readonly.its.umu.se-shibboleth.xml b/swamid-2.0/jira-readonly.its.umu.se-shibboleth.xml
deleted file mode 100644
index cab40477..00000000
--- a/swamid-2.0/jira-readonly.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://jira-readonly.its.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-02T09:29:53Z">
-      <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <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://jira-readonly.its.umu.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://jira-readonly.its.umu.se/Shibboleth.sso/Login" 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://jira-readonly.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <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://jira-readonly.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Jira Readonly, ITS, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jira Readonly, ITS, Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Jira Readonly, ITS, IT-stöd och systemutveckling, Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Jira Readonly, ITS, ICT Services and System Development, Umeå University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://jira-readonly.its.umu.se/shibboleth</ds:KeyName>
-        <ds:KeyName>jira-readonly.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-readonly.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEPDCCAqSgAwIBAgIJANharrJ1kK96MA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
-BAMTGGppcmEtcmVhZG9ubHkuaXRzLnVtdS5zZTAeFw0xNzEwMDUxMzMzMzBaFw0y
-NzEwMDMxMzMzMzBaMCMxITAfBgNVBAMTGGppcmEtcmVhZG9ubHkuaXRzLnVtdS5z
-ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAL2lIUXq5mQpOWEs/1ef
-AylbT6dnr4UrTB2GUIqp378PG+g2RyZ+fqOHj3oSzAFA1jAYjmB6vcUiP5kZ05c/
-Ji3QCiLgeB0ZY1LSxItc1rvhGifdnP1O7nOVJMghxREUJYGuCOvN0K9l+5D0KF3F
-FV1LvEIaSq/JxRMCOjOMwk/1pGUvyGO06zHkwp7I1qHw7c1E5d6K3SgMQYo5vKN9
-NnytVJSD7kpBCJq587IJIViwKfnolaVuo8Pxgh7k9QingU2/FgVAfgH/WYpaAEFN
-3lK0/kqJ8MEFZtcgAhKozem3gXJPThZbE4GkVenpsWusk+PbnPDzyKjpVIvYFXrb
-lrnr9aQFgo6Wck4wKFyaEyBb1f6WKuDwqkqh316QbxNzyHrq8EGXURqFC+XSvVws
-faW9VRsKnnArNNcu2HZzySb2EmmNsGN7OiyPlyOnRieBpc6enhMml/s+PTXQWiEm
-2b/jfncFv57xzKGZBjJLQOUSbwF1jVL0LnSR4jimMko6MQIDAQABo3MwcTBQBgNV
-HREESTBHghhqaXJhLXJlYWRvbmx5Lml0cy51bXUuc2WGK2h0dHBzOi8vamlyYS1y
-ZWFkb25seS5pdHMudW11LnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFFXZ99B+36oz
-wR/9FuZE8OO881g2MA0GCSqGSIb3DQEBCwUAA4IBgQAuZd9Tvec20CLwmsGuQXdf
-ZfKehnyb2B59M5TQXUAAKuWNC+OEf9eKcZVFllk+oHC3vBwr1wNZOL0T6FuUggRp
-Dxys9KB0ZVUuFTdReN/VTcnmrG4suX3a+dc26DNS1FIpGjNU6Aewq6IhrFDHBAo5
-+jKwwly2k/FqsKrlDl5vBvETIwLpPCez/TX3MwZpscL3Z6/X4eQ7SfPRSUPELfua
-9eOqdjKonmQQr9C5ToQVkpV5uhmOOCJb0TrRxUPBMOXxkNRwrS4gRyzOCt+ycD2t
-r56QOuBgmN/NYD1NPvyQ7DpG28Z0H8ExcMZjZsnf6z1ycTyHN4vJPf0Zk+rX8pQW
-PYiBBoWfLR00fTfbIINyIWFQcnjTr0CVmn9YwQhBnMlXbDPWr4yWmC/qtcImdQQV
-dKiQv20+ws1uCPJ9dxt+HIeGNQaTw1fD9D7VwZUxMLWZHUOuAQzA63InwonILPZ+
-z2WWFwMqAVK8b+Pyka5TPYAnMQT9rwB/9YyikBjIamk=
-</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://jira-readonly.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-readonly.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/jira-sd.its.umu.se-shibboleth.xml b/swamid-2.0/jira-sd.its.umu.se-shibboleth.xml
deleted file mode 100644
index beb5d5ac..00000000
--- a/swamid-2.0/jira-sd.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://jira-sd.its.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-09-13T06:54:03Z">
-      <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>
-      <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://jira-sd.its.umu.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://jira-sd.its.umu.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>jira-sd.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-sd.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/TCCAmWgAwIBAgIJAJzJDm/36OMSMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMTEmppcmEtc2QuaXRzLnVtdS5zZTAeFw0xODA5MDMxMzA5NDBaFw0yODA4MzEx
-MzA5NDBaMB0xGzAZBgNVBAMTEmppcmEtc2QuaXRzLnVtdS5zZTCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBANBxcuipPDAuHxca9cPEV5hUqx5nHSyjda3l
-oXY5UEhdWn2/P7DoXVhLXrJTqUqlDfKrYKceZVe6wyqna08XF7XbJhoX5FGdQY/U
-+3UPcmfVf+uLq2B8tgd2xA8QJaVJ7TRvHO+DfSfIs5RGIYxCKJtz1U8p23n6Q2hK
-krnKo65jN0yUey/7udcF+mTaW2rLNZR3/rsLT494d9p5CowJvZpAogFpdkxUIpEt
-Q1gmeNrex/GeSbAwf6NlrzR6Xwt6HQITUjWwNJG3GSwomFE/VgKHV45YPnK8TLgf
-b1lvoLrSxr+ltRC0aQy4CPaQ6hurEkCSeQqZwxs0tkmTmJrbixsAAPPC71myoKNF
-SHB90M+S1EIhWsR5MFNdQJmiNRrQbt/8OzztRpIeott56Gcxxhb9ZfBy7sBGfgHd
-cBu+Q0MzjMivCs2in8GYx0PcpcdZVy8BS+FqaNayvsztk4f/b9dFB6SP9l/rj+0W
-1EnuOqK5LEOUfQ7qYjQc8eyGxmdQsQIDAQABo0AwPjAdBgNVHREEFjAUghJqaXJh
-LXNkLml0cy51bXUuc2UwHQYDVR0OBBYEFFi09G7rM5kDSp/tvk1UTL8drFPyMA0G
-CSqGSIb3DQEBCwUAA4IBgQAUSmGCPFp4PEVg5e02ZBQ1Nu9/3uOOAds0wwwZSEkc
-UPrac1ciP9Z24g/AWRB9gIgjtcM2kMp/wIozdZnCg4kgX45o5ZURI0hklrht25Sb
-/sxmdSYaeENRx7QRYYfpMoUYIrFDgPLJI6EaoLgIVWVXwrQhbYBDBi5KKtSVX1si
-2fos1ygP9OVIOVmUyE1e6PW/UQsHAAKeORg01OtnvRS0asuZV81KUNoTOR0eRKWM
-w/8NxKiaskyPPI2aPpk5+vn0Y3saC1NNIp9vPaFlyqH7ilWHaU0SsdHe7OJwtF+T
-sqnM5OepztXma7Q08DWCLYk5jZzVlJggY8pTsrTdzuDpS+BbGRjrCJ8Y7814V+mq
-RfOO0Cxo88tJwGHts//hbfK47BYeh8wYzOxIUaiz4rZqoaF2JQSv0kGZqqkwL7EW
-1mu8k2gYY1nGI3yV1bp0QsGhmYMfZlJQG334aY/j4pNozyPLRZ8Fo6zFKVgIbfFH
-ZjkXNw4DlY+JVHh7n3nc+5c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>jira-sd.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-sd.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/TCCAmWgAwIBAgIJAM42jZ8EdFMaMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMTEmppcmEtc2QuaXRzLnVtdS5zZTAeFw0xODA5MDMxMzA5NDBaFw0yODA4MzEx
-MzA5NDBaMB0xGzAZBgNVBAMTEmppcmEtc2QuaXRzLnVtdS5zZTCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBANbBN/zxh+nu5IuARztUL2nasKuuQADS3PN7
-zLs+KUgvJZrpKDrqZG+p3Nb1kyPT4wbvdgOIy33N6HXiJmAVRKo+ZvGvEU1SQaES
-f3V3+TKyxtZwbSJelzUpSX4b28/BegsdqPso6tJM8SxJ/GMXL/tTpJxbypVDdLbr
-NJV9fjz2vTESC+Sq0TUY01IPplDexaPekp/UlyOtZ2Q1v0ctyd2wyhOQVtOnECFG
-a/iWj1GsJHbHKi0LH1ClXkQL9YBifAIImhZDmWzRCJFZq+7XOxn1ydGYOhIfpVfO
-E/em+L4RvXJBxv/KgehzZd5791ueWchh6biNluKtgIwMmn21mWbue46F8K+eRxnz
-b5uEj2MlvdtF0btXagyUJJod/558muYfhQXrewZrz2oL4C72IA9R3TvbFY4jLJ2j
-GFpvq97UDfLai2lnBUQAFFlAvWCBu//zz49ASUpuTKj/Vu3J+hwgL2HPHxSj3AQz
-n520TyAZnCEs4CrgdZ2Mp5j8EXnxkQIDAQABo0AwPjAdBgNVHREEFjAUghJqaXJh
-LXNkLml0cy51bXUuc2UwHQYDVR0OBBYEFHM8VhmSWreUBAu2Rthl4DUNbdORMA0G
-CSqGSIb3DQEBCwUAA4IBgQCZJRGKiCtfR18xbbc27iCFNPfaF1d1BJiDLs8NiJ4w
-aB0RshaqnLb6blT/Bnw5qGzCoEHw3AHd5mvLLdAf2EhqtR3fkWj3BdTcgZu4lkrD
-MWWyGw0X4Th1BwmymijiEnQ3x1VNwdJusDZcamNzpVbxk3L2RfUa7I3Pvwhky5RV
-4cdXRjBaNcztBBteZUgBmTZb6QeLNJIY4Kes+QIBhSYikcofcV4X3dCEd4dDmoiH
-g6GPLO81hXjar13UdcINbS/lc+Rx0xgQWCxK/SVKubuP5Z6pCRyw17wN685GI5b2
-twbryB+IeZuiaFBKBVbIJxm52bK7SKqGeb3Ey5TbBojIoFTZQV/5y5m2MfZouy87
-rHqR8hVDD17imbVgA5T8mq2j/TSfHixffM5evFOWXJb0Ol9GIfPFGbkNUNIw4lm4
-qOUc5+4gddxsX6kGA5oVZp2AUa8mVTNnYqPwXr1fLQ/7++HIvbQDQOAulV82FHMX
-vTz6GxqGwbbG9rd9A8MrOqw=
-</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://jira-sd.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-sd.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-sd.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-sd.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-sd.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-sd.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-sd.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-sd.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml b/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml
deleted file mode 100644
index bc288e42..00000000
--- a/swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml
+++ /dev/null
@@ -1,53 +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://minasidor.ladok.umu.se/shib-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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 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://minastudier.ladok.umu.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://minastudier.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://minastudier.ladok.umu.se/shib-sp</ds:KeyName>
-        <ds:KeyName>minastudier.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=minastudier.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAK5Ick7Lu3Y+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTAeFw0xMjA1MzEwODQ1NDZaFw0y
-MjA1MjkwODQ1NDZaMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMaB49YGTFm67lkGcJW0
-2j8nFZQ7WVK/uWEufaL6IRWWGTPm7e7hPRrwHXOqJpZQjIT87d/9lnjpgWThOs/D
-pV7BX7H5d4+EFihUV7czOrvdASubTf429yUpRY1ch0/134jks2uOgBlHznOnDYuD
-KxsktAe9Eau9HJ1WBfIdj3BAD+5IGcoassZimysSqhWKrQ4qKQhb4Z2i25DnF64r
-O+Xdevu1x3EBUfFpmodXo8jSlSmUm/RjabCQvE0ZnNVDHFigFlE0sTJQVKthZVfw
-16tor6Z7G3JTPB+nGTzC3vQYt4Ea3fMBIHsNKykXM22F7NXAYf4Pm3o6T4JY3/L6
-spMCAwEAAaNwMG4wTQYDVR0RBEYwRIIYbWluYXN0dWRpZXIubGFkb2sudW11LnNl
-hihodHRwczovL21pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZS9zaGliLXNwMB0GA1Ud
-DgQWBBQStVXl5Vu66/j8S1iZTj3rSmV42zANBgkqhkiG9w0BAQUFAAOCAQEAWRFm
-ZJTf5A2awpmUT6yNngEAbANXFgspa55XDsSgbv/9yCRmhrbTWADbp4SIuAYzmY+U
-O2qoHrQV2BaJA1WomGWP8Sgx+eZzcea4dO69RH/8lL7wgK13Bp5osjRgCGXX8Zih
-BLJ1BCwX9VZ1w0vPXmj/KLc7XM9sRmZvNqaD6tEeKeHgC9AUsMfrYJW6dpDeiunC
-6DBBshYlj0vhGiRUqLvZcUblNNrOhfEiaav4up4gRd93SEUUdqyYhpJRNNnHAvN1
-DFBgFVzSBKut1DQ6H8ikkUDDh6MHJMOwpv3NEXk776HgwMFDmHlE6Gnysa8aV/wj
-BSjBWAdDFrXgrc1jPw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://minastudier.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/minastudier.ladok.umu.se-user-idp.xml b/swamid-2.0/minastudier.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 07ee555f..00000000
--- a/swamid-2.0/minastudier.ladok.umu.se-user-idp.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://minastudier.ladok.umu.se/user-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol 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://minastudier.ladok.umu.se/user-idp">
-    <Extensions>
-      <shibmd:Scope regexp="false">minastudier.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAOgfe3lcHWPLMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTAeFw0xMjA4MDIxMjA0MTVaFw0yMjA3MzExMjA0MTVaMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGOjGCL1qrKrmLW7yeUilJSjI9SpDoqMkN6I6iMkCePamRzWuVZrNcI80Llh6Oh9dZ8KDexoYC0eMhBSN0vj0xAgMBAAGjgYUwgYIwHQYDVR0OBBYEFCBs1ni/aMI3mmsoV9WUPaHgNPn2MFMGA1UdIwRMMEqAFCBs1ni/aMI3mmsoV9WUPaHgNPn2oSekJTAjMSEwHwYDVQQDExhtaW5hc3R1ZGllci5sYWRvay51bXUuc2WCCQDoH3t5XB1jyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAxWYtrMwDnEwv1jtWk0tUpXwS0jvmnWHZEc9bvucA8OALEo5LCuIkC5aKgQLP4WPMVlrb035x3j+kM1utp0hPqw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se:8444/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://minastudier.ladok.umu.se:8443/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://minastudier.ladok.umu.se:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.ladok.umu.se:8443/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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">minastudier.ladok.umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAOgfe3lcHWPLMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTAeFw0xMjA4MDIxMjA0MTVaFw0yMjA3MzExMjA0MTVaMCMxITAfBgNVBAMTGG1pbmFzdHVkaWVyLmxhZG9rLnVtdS5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGOjGCL1qrKrmLW7yeUilJSjI9SpDoqMkN6I6iMkCePamRzWuVZrNcI80Llh6Oh9dZ8KDexoYC0eMhBSN0vj0xAgMBAAGjgYUwgYIwHQYDVR0OBBYEFCBs1ni/aMI3mmsoV9WUPaHgNPn2MFMGA1UdIwRMMEqAFCBs1ni/aMI3mmsoV9WUPaHgNPn2oSekJTAjMSEwHwYDVQQDExhtaW5hc3R1ZGllci5sYWRvay51bXUuc2WCCQDoH3t5XB1jyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAxWYtrMwDnEwv1jtWk0tUpXwS0jvmnWHZEc9bvucA8OALEo5LCuIkC5aKgQLP4WPMVlrb035x3j+kM1utp0hPqw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.ladok.umu.se:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
deleted file mode 100644
index 1eaeb71e..00000000
--- a/swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.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://shibboleth.nyautb.its.umu.se/shibboleth-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol 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://shibboleth.nyautb.its.umu.se/shibboleth-idp">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.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://shibboleth.nyautb.its.umu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nyautb.its.umu.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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml b/swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
deleted file mode 100644
index b7160036..00000000
--- a/swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.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://www-en.nyautb.its.umu.se/aws-sp-en">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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 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://www-en.nyautb.its.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www-en.nyautb.its.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>www-en.nyautb.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www-en.nyautb.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIJALu59e1deADVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHd3dy1lbi5ueWF1dGIuaXRzLnVtdS5zZTAeFw0xMTEyMTYxNDM4NDhaFw0y
-MTEyMTMxNDM4NDhaMCMxITAfBgNVBAMTGHd3dy1lbi5ueWF1dGIuaXRzLnVtdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8Yrglt4eeLRvVbTB9M
-pOgJIqJ513B0vwmoGHvlOTsKOnwx8anCEfDw1/lUW6W3CcSc68z4AkuJdxN1TK9k
-RzPxV7o1GfwTJlKNc8yDJBgMl2IuIoIhpApNa3wcd5Wokfcem6EiVCcQdIwc9qKD
-JYBXE/fc1akrRoj0oAei787p5b8sNSvIUh5UDFpSZMpHiwBB7Vjw9+019Di1XHvB
-qPbvKd/6AhQUzWyA+iwANYIiGthfuVtlEfBp4OVcir2P/JHf0bVu84yA4Z95iVnb
-/5/5Dc4THL/Jm/RJfqLqFkozBZZO7jg4gWXCGY3Qjx5QYnJuAysod1/qyX9yRniD
-fIECAwEAAaNyMHAwTwYDVR0RBEgwRoIYd3d3LWVuLm55YXV0Yi5pdHMudW11LnNl
-hipodHRwczovL3d3dy1lbi5ueWF1dGIuaXRzLnVtdS5zZS9hd3Mtc3AtZW4wHQYD
-VR0OBBYEFOgsgCRrKTKebJhZYO1bwFPupSuFMA0GCSqGSIb3DQEBBQUAA4IBAQBw
-2SY3k7yoFz/bkr+sIyUy4Fk+K518jSoeVJATzx91rvny1ocymRCd/dPeS7C6zTMo
-zPUHwxwql8gRygJ8O3V/0tAa2Fxdv9qNDRBNXzcarhS/cgsajq8mpWTetuOoX/sH
-nt+NuT6/w9dbRwS4jm2VeUPKMPNV/T9jEpm6haIBTAi0nRSX9CDk9ua6YQJnFnrY
-eDAbPLlLDWoLMfSFSZt57hqNGaOUvVkD+a7RotqaZ9ysHM8BpjvCEVKjpUE9TZ1T
-0fQxgfgbLgn1oG8hSELpCUwE5uFkC8A3c/aqEen6POsOBoMjQsVkiPQ+AZFYmBHg
-S72ZoHYu9zf1dW77BoUB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml b/swamid-2.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml
deleted file mode 100644
index c70a788b..00000000
--- a/swamid-2.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml
+++ /dev/null
@@ -1,81 +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://www.antagning.nyautb.its.umu.se/ecs-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.antagning.nyautb.its.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>www.antagning.nyautb.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.antagning.nyautb.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDVDCCAjygAwIBAgIJALThm68PZA+AMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-BAMTH3d3dy5hbnRhZ25pbmcubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTUy
-MzUwWhcNMjEwMzEzMTUyMzUwWjAqMSgwJgYDVQQDEx93d3cuYW50YWduaW5nLm55
-YXV0Yi5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-vWsVqpeAHZvGMmmaL2phtLRGxocMfqR75UaWPCQt+I8vpIRwgFBxXl5QC1LUENBS
-A8eibdLSfqpbrNIjuEeTQSW4ISy6WZFxHw5lqUBPQrNqb7L/3UFy0bLO7+ALmasB
-5+AMJsfIpseNpIPiOptMmT/zFH3lKUZ8/Fc2WdzEBVplENQbKSgcsYmwkCkJDUAV
-YM3mvzQqk3nz6BbcK7770oOd376/vzNY0YIURkvE4+ypKqkV4ZWwjJTzwecc7Gza
-UoqgpQyNNWYIa6cTmjI6X+ND+JXZizzu3m45IlCHDcALcEZvg6iS4p6yGG53O3Mb
-ZVwofQPWmWMrb2d1AUlWCwIDAQABo30wezBaBgNVHREEUzBRgh93d3cuYW50YWdu
-aW5nLm55YXV0Yi5pdHMudW11LnNlhi5odHRwczovL3d3dy5hbnRhZ25pbmcubnlh
-dXRiLml0cy51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQiWuYi/7QBm63v13Qfrr0M
-GioO+jANBgkqhkiG9w0BAQUFAAOCAQEApAmufqtUt4qnAaz+4ocUcLWNRMvvFcS0
-Gx6SxD3ZICCuDfoJ6hMpxZWu3QZslCgafO9KyWc0VM4iXkwYmR09Qyn3eTXIjehe
-uoMuk00A6HnGcpKu4/OIdv15KMSovuEm5lFzG488GUcdx9R7huQO9b26kwiSaXmn
-3G2cIvgXwi3uh6zTEF2YfP5b1eA4I28NokK0YM2KkRD/C3kQK9pzJMuS/rXC8TKU
-TbZlOTYIPQGq9kEPYquV/mCFBof64rm0e0/EtdsWhjB1RkB/UAxpuD4Lxpg7kIO6
-blmiwLs0G0IFUYT60lInJiH7a2ooqJ0rc6Ysk33BnWCVRC7IJr8kYA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.antagning.nyautb.its.umu.se/ecs-sp</ds:KeyName>
-        <ds:KeyName>www.antagning.nyautb.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.antagning.nyautb.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDVDCCAjygAwIBAgIJALThm68PZA+AMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-BAMTH3d3dy5hbnRhZ25pbmcubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTUy
-MzUwWhcNMjEwMzEzMTUyMzUwWjAqMSgwJgYDVQQDEx93d3cuYW50YWduaW5nLm55
-YXV0Yi5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-vWsVqpeAHZvGMmmaL2phtLRGxocMfqR75UaWPCQt+I8vpIRwgFBxXl5QC1LUENBS
-A8eibdLSfqpbrNIjuEeTQSW4ISy6WZFxHw5lqUBPQrNqb7L/3UFy0bLO7+ALmasB
-5+AMJsfIpseNpIPiOptMmT/zFH3lKUZ8/Fc2WdzEBVplENQbKSgcsYmwkCkJDUAV
-YM3mvzQqk3nz6BbcK7770oOd376/vzNY0YIURkvE4+ypKqkV4ZWwjJTzwecc7Gza
-UoqgpQyNNWYIa6cTmjI6X+ND+JXZizzu3m45IlCHDcALcEZvg6iS4p6yGG53O3Mb
-ZVwofQPWmWMrb2d1AUlWCwIDAQABo30wezBaBgNVHREEUzBRgh93d3cuYW50YWdu
-aW5nLm55YXV0Yi5pdHMudW11LnNlhi5odHRwczovL3d3dy5hbnRhZ25pbmcubnlh
-dXRiLml0cy51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQiWuYi/7QBm63v13Qfrr0M
-GioO+jANBgkqhkiG9w0BAQUFAAOCAQEApAmufqtUt4qnAaz+4ocUcLWNRMvvFcS0
-Gx6SxD3ZICCuDfoJ6hMpxZWu3QZslCgafO9KyWc0VM4iXkwYmR09Qyn3eTXIjehe
-uoMuk00A6HnGcpKu4/OIdv15KMSovuEm5lFzG488GUcdx9R7huQO9b26kwiSaXmn
-3G2cIvgXwi3uh6zTEF2YfP5b1eA4I28NokK0YM2KkRD/C3kQK9pzJMuS/rXC8TKU
-TbZlOTYIPQGq9kEPYquV/mCFBof64rm0e0/EtdsWhjB1RkB/UAxpuD4Lxpg7kIO6
-blmiwLs0G0IFUYT60lInJiH7a2ooqJ0rc6Ysk33BnWCVRC7IJr8kYA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml b/swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml
deleted file mode 100644
index 0823cf59..00000000
--- a/swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,55 +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://www.nyautb.its.umu.se/aws-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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 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://www.nyautb.its.umu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.nyautb.its.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.nyautb.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.nyautb.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAJcyTvmn7mRTMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFXd3dy5ueWF1dGIuaXRzLnVtdS5zZTAeFw0xMTEyMTkwODIwMTFaFw0yMTEy
-MTYwODIwMTFaMCAxHjAcBgNVBAMTFXd3dy5ueWF1dGIuaXRzLnVtdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMl6YqXYCmYCBA2wmWWFdvCBiFWD
-bPS0sDIPrI1v8I985FB0W7lXmsQu98WYFO/khXVLWMmFhJOa0NEhv3XwWHYD8BGm
-0muTxcToY93nG7zS4/wllwhryRENaQH1PaYuMf2M+tJcg5wu6kSx8tqHlbjo9Vzl
-Rkm+gMU0TnQOsppQV2GibVg8RklyBGAuz6husU1X4GMA/zeqrQdfXM/rjAoEx8QA
-qbYSxEYM++poaOtzPM/oqDoNgz3KRL0q9mslxyAYOGDfeNZLJ/j38pqS4cWr2egN
-U2m5TiV2WPSEHq5QI6ifW+BohiB7z7t0q8upS0p0cRSKU3AeIK4wk8cPukECAwEA
-AaNpMGcwRgYDVR0RBD8wPYIVd3d3Lm55YXV0Yi5pdHMudW11LnNlhiRodHRwczov
-L3d3dy5ueWF1dGIuaXRzLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFMK38q32i8rg
-ZUQ8eO4pTY5sTJqwMA0GCSqGSIb3DQEBBQUAA4IBAQBMr8bwjSKSv3pNhi+e+uiY
-1BcnbV+kPs5WShZ0BiuD9iVXFUcN8Q4HE+Dl5uQ3epcyDqOQNz8+lBPxYPDrZy2b
-IA8SwidzDI6PqkQ9nSKxRJ7jSzbr9E/jDmNcgirltRI4JiXx+53BTay/KJ33gQFh
-RtQmpiQtKDt3e/i1cZOFv1rUW8UPPH4Z0R6iMtbKPYXR7ZGva3QOlB3Fowe3w2Z2
-q0fSD2UYJYx8S9IpkqG7mWO35bLr82mvxauG36M+2z9nXaxpgjCDWMCBQUe5WvxK
-1mxJ+VnWnK6TOUMhsZaXSLi/mQJkIQ8a7v1RdY3sBVHvwJqotARxzJFpYHpV+Qe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml b/swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml
deleted file mode 100644
index 70fcd19a..00000000
--- a/swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml
+++ /dev/null
@@ -1,81 +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://www.studera.nyautb.its.umu.se/aws-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.studera.nyautb.its.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.nyautb.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.nyautb.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJALHD277l+j1AMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXd3dy5zdHVkZXJhLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjE0MDQ1
-N1oXDTIxMDMxMzE0MDQ1N1owKDEmMCQGA1UEAxMdd3d3LnN0dWRlcmEubnlhdXRi
-Lml0cy51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQHmLx
-TbE4rQx8Hg4Qm9tQJIjDWn7fw28ObHHCS00Yb8F3kr2bHsLrCF6Y85mx6GRwtgWD
-iNk8oBnpodvtsEyoFXAwVELhQPFwAtl5F0SnJhOv9nutIOtpdSvuJBxp8W19h1Jj
-LflHNfGogeFDDAtAHBHYDynRZsQDFkzwNPbVCOJDlYJP0cNKW904xFxNBbUHUOyH
-hL6nec8TRsl4XyGhksExe7ZEs5uo1Xd/XBiNqHP21Sd5OJN95aZ/1YEf0bjPmNv5
-S4FKytqyz1dioX8M4qfRYvRVfZcNU8tr4EhXRqFhb0Fqnck0JtuzIR2Hwae4RS9o
-M/w97co9k/l6mzgnAgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy5zdHVkZXJhLm55
-YXV0Yi5pdHMudW11LnNlhixodHRwczovL3d3dy5zdHVkZXJhLm55YXV0Yi5pdHMu
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUPKMC1ATCTahbug+nMsWZALEg8LQwDQYJ
-KoZIhvcNAQEFBQADggEBAI4dbW6tKX4KXo8zjOFqXL7FfW43LAgRJW6L9seU+2uk
-Ll9WDUtYxAXOzqBbZyZtg1RXjOhu7nOCRmKRKkg41IQbc/JSvYbz4L9QstQc3dUb
-Tl8s5Ot3QwRxTPfpGFm0AYmNhtzJYUMYpbP/q1zL5QXECDBl/0R0mhzhFJuC0ySK
-PHOR+XTkbE5peDN47qMxyWmPoqhZWBG2OevPWWY23/MFL/YDqJIE58J5sep8LZh7
-YI6U+FLHc3pgFfgveUhTGmocDVyZH8ptWcSyZBOCiqi9A+Q+OMn3ZaiWjhzgAHUH
-YBqltfATQ9fVPJDBuibrJjTB9qV4oj5RvzpRo6tp1MQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.studera.nyautb.its.umu.se/aws-sp</ds:KeyName>
-        <ds:KeyName>www.studera.nyautb.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.nyautb.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJALHD277l+j1AMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXd3dy5zdHVkZXJhLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjE0MDQ1
-N1oXDTIxMDMxMzE0MDQ1N1owKDEmMCQGA1UEAxMdd3d3LnN0dWRlcmEubnlhdXRi
-Lml0cy51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQHmLx
-TbE4rQx8Hg4Qm9tQJIjDWn7fw28ObHHCS00Yb8F3kr2bHsLrCF6Y85mx6GRwtgWD
-iNk8oBnpodvtsEyoFXAwVELhQPFwAtl5F0SnJhOv9nutIOtpdSvuJBxp8W19h1Jj
-LflHNfGogeFDDAtAHBHYDynRZsQDFkzwNPbVCOJDlYJP0cNKW904xFxNBbUHUOyH
-hL6nec8TRsl4XyGhksExe7ZEs5uo1Xd/XBiNqHP21Sd5OJN95aZ/1YEf0bjPmNv5
-S4FKytqyz1dioX8M4qfRYvRVfZcNU8tr4EhXRqFhb0Fqnck0JtuzIR2Hwae4RS9o
-M/w97co9k/l6mzgnAgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy5zdHVkZXJhLm55
-YXV0Yi5pdHMudW11LnNlhixodHRwczovL3d3dy5zdHVkZXJhLm55YXV0Yi5pdHMu
-dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQUPKMC1ATCTahbug+nMsWZALEg8LQwDQYJ
-KoZIhvcNAQEFBQADggEBAI4dbW6tKX4KXo8zjOFqXL7FfW43LAgRJW6L9seU+2uk
-Ll9WDUtYxAXOzqBbZyZtg1RXjOhu7nOCRmKRKkg41IQbc/JSvYbz4L9QstQc3dUb
-Tl8s5Ot3QwRxTPfpGFm0AYmNhtzJYUMYpbP/q1zL5QXECDBl/0R0mhzhFJuC0ySK
-PHOR+XTkbE5peDN47qMxyWmPoqhZWBG2OevPWWY23/MFL/YDqJIE58J5sep8LZh7
-YI6U+FLHc3pgFfgveUhTGmocDVyZH8ptWcSyZBOCiqi9A+Q+OMn3ZaiWjhzgAHUH
-YBqltfATQ9fVPJDBuibrJjTB9qV4oj5RvzpRo6tp1MQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 101529df..5ef2f1c2 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -282,7 +282,6 @@
   <xi:include href="swamid-2.0/www.test.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/expert.test.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/its-jira-test01.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portfolio.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rt.sunet.se-shibboleth.xml"/>
@@ -333,7 +332,6 @@
   <xi:include href="swamid-2.0/test.valda.i.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-dev.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-next.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/jira-readonly.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/prestaging.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
@@ -400,7 +398,6 @@
   <xi:include href="swamid-2.0/hb.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/jira-sd.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mdh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lnu.hr.evry.se-shibboleth.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 6cbadadd..c4557da7 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -6,13 +6,9 @@
   <xi:include href="swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/openidp.feide.no.xml"/>
   <xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/minastudier.ladok.umu.se-user-idp.xml"/>
-  <xi:include href="swamid-2.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.suni.se-adfs-services-trust.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index a5022c72..51a723d0 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -1,15 +1,8 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-testing-sp-1.0.xml">
-  <xi:include href="swamid-2.0/www.studera.nyautb.its.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/www.antagning.nyautb.its.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/vhs-dev01.dyndns.org-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/smultron.catalogix.se-8090-sp.xml"/>
   <xi:include href="swamid-2.0/vmfront.lan.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml"/>
-  <xi:include href="swamid-2.0/bhb-00.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/kisetest2.user.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kitstidp02.tst.ki.se.xml"/>
author	Fredrik Domeij <fredrik.domeij@umu.se>	2022-08-18 16:28:46 +0200
committer	Fredrik Domeij <fredrik.domeij@umu.se>	2022-08-18 16:28:46 +0200
commit	a57ac64db8df42885bba56966df098f789e3d9ef (patch)
tree	df1e645f3e5f5cea33f28ed7b8eb8672aa179580
parent	6e0569dd414c00c0c7e3bad0a9683b97118148d5 (diff)