Resolves SWAMIDOPS-7770 and SWAMIDOPS-7769

5 files changed, 0 insertions, 180 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index b0afb7a9..e6c2895e 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -110,7 +110,6 @@ kisetest2.user.ki.se-shibboleth.xml
 kitstidp01.tst.ki.se-idp-shibboleth.xml
 kurser.math.su.se-shibboleth.xml
 kurser3.math.su.se-shibboleth.xml
-ladok.su.se-shibboleth.sso.xml
 ladok3-00.ladok.umu.se-gui-sp.xml
 ladok3-01.ladok.umu.se-gui-sp.xml
 ladok3-02.ladok.umu.se-gui-sp.xml
@@ -153,7 +152,6 @@ meetingtools.nordu.net-shibboleth.xml
 meta.eduroam.se-shibboleth.xml
 minasidor.ladok.umu.se-shib-sp.xml
 minastudier.ladok.umu.se-user-idp.xml
-minastudier.su.se-shibboleth.sso.xml
 mondo-test.su.se-shibboleth.sso.xml
 mondo.su.se-shibboleth.sso.xml
 mp.uu.se-shibboleth.sso.xml
diff --git a/swamid-2.0/ladok.su.se-shibboleth.sso.xml b/swamid-2.0/ladok.su.se-shibboleth.sso.xml
deleted file mode 100644
index 02b43720..00000000
--- a/swamid-2.0/ladok.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lpwtool-prod-ladok1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lpwtool-prod-ladok1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAKAlvioJS4MwMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHGxwd3Rvb2wtcHJvZC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwMjI0MTU0NTUy
-WhcNMjAwMjIyMTU0NTUyWjAnMSUwIwYDVQQDExxscHd0b29sLXByb2QtbGFkb2sx
-Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAseNPMakP
-gEk64DPwWm63DxiReYuQTvgZqSZHZDS/5XjpgWsFcG/at4fEnymd21lL0YVDJq3D
-a1ERNofKiPnDGWa84wzlZIEF4EG72I7hZkX/rLnXU6jaoUfI4umX0hdCySNJGRAR
-f6CyTaSyLp8lfI44DwHrtR76oo/8FZ/+/i5u2cosSBK6S9eZ+JVMYnvgeXNmO2/W
-1vgBq2JRQmxjKON1Os73jz/z/cr0wIbil8Adl9zmRjKebwrVZpgh2/90vkCL/JR0
-FpcbHZuPlwVkydk8aaeRmmThcNl3AHbjMQ1BBOFxKgTDX499JKk2GnVwGP6KpeVH
-IZf+JpCs8Y1vIQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXByb2QtbGFk
-b2sxLml0LnN1LnNlMB0GA1UdDgQWBBSsRm1AtkLKxRbwQnzJJgzdBGnzRjANBgkq
-hkiG9w0BAQUFAAOCAQEAIqWjPq4bS0KK38rA89JlY2snXM/Xp3GCxdqL/J6AIijX
-wAekdKoK1XRvQ6u/m2iPyDdS5dyLf89qqzIR4IY5XDWQaOPCUYMc+B0Rx0blg8JM
-TIzxu8I8K2lycbWlvY2JxE/4yROSay2gSB5NSm0iaH/dATuu+/p1+0Ntm+7VXXJ7
-3D7J621eGxC9fDcw7eM1PrezvXlVszyPk2Djb7lyXzHCxhhqlfFEm9Po2+Uw0AWS
-dVRlM1/Sf6CV2UYcaNPxvKg8An7pzvSVBruVpx1nbzD4zj9Cr/idPzAFmXB0Ikom
-R3H6+4G4tQJixe4WRSG0z0Z1inVFppE5WqimH/Cp4Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lpwtool-prod-ladok1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lpwtool-prod-ladok1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAKAlvioJS4MwMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHGxwd3Rvb2wtcHJvZC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwMjI0MTU0NTUy
-WhcNMjAwMjIyMTU0NTUyWjAnMSUwIwYDVQQDExxscHd0b29sLXByb2QtbGFkb2sx
-Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAseNPMakP
-gEk64DPwWm63DxiReYuQTvgZqSZHZDS/5XjpgWsFcG/at4fEnymd21lL0YVDJq3D
-a1ERNofKiPnDGWa84wzlZIEF4EG72I7hZkX/rLnXU6jaoUfI4umX0hdCySNJGRAR
-f6CyTaSyLp8lfI44DwHrtR76oo/8FZ/+/i5u2cosSBK6S9eZ+JVMYnvgeXNmO2/W
-1vgBq2JRQmxjKON1Os73jz/z/cr0wIbil8Adl9zmRjKebwrVZpgh2/90vkCL/JR0
-FpcbHZuPlwVkydk8aaeRmmThcNl3AHbjMQ1BBOFxKgTDX499JKk2GnVwGP6KpeVH
-IZf+JpCs8Y1vIQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXByb2QtbGFk
-b2sxLml0LnN1LnNlMB0GA1UdDgQWBBSsRm1AtkLKxRbwQnzJJgzdBGnzRjANBgkq
-hkiG9w0BAQUFAAOCAQEAIqWjPq4bS0KK38rA89JlY2snXM/Xp3GCxdqL/J6AIijX
-wAekdKoK1XRvQ6u/m2iPyDdS5dyLf89qqzIR4IY5XDWQaOPCUYMc+B0Rx0blg8JM
-TIzxu8I8K2lycbWlvY2JxE/4yROSay2gSB5NSm0iaH/dATuu+/p1+0Ntm+7VXXJ7
-3D7J621eGxC9fDcw7eM1PrezvXlVszyPk2Djb7lyXzHCxhhqlfFEm9Po2+Uw0AWS
-dVRlM1/Sf6CV2UYcaNPxvKg8An7pzvSVBruVpx1nbzD4zj9Cr/idPzAFmXB0Ikom
-R3H6+4G4tQJixe4WRSG0z0Z1inVFppE5WqimH/Cp4Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/minastudier.su.se-shibboleth.sso.xml b/swamid-2.0/minastudier.su.se-shibboleth.sso.xml
deleted file mode 100644
index f51430bf..00000000
--- a/swamid-2.0/minastudier.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minastudier.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastudier.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://minastudier.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lpwtool-prod-minastudier1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lpwtool-prod-minastudier1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIJALTp+wTwop0PMA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
-BAMTImxwd3Rvb2wtcHJvZC1taW5hc3R1ZGllcjEuaXQuc3Uuc2UwHhcNMTAwMjI0
-MTU1MTU1WhcNMjAwMjIyMTU1MTU1WjAtMSswKQYDVQQDEyJscHd0b29sLXByb2Qt
-bWluYXN0dWRpZXIxLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAx59TlYR92Fuzux/IiWYU3rv/fByvOlbCtiIFyfyLsV//YayVDv/mICYc
-/AiWxDW/Tq7rw1z/rgXvyYldvGjSuV2jOtpDVOIbTKHcZn8O9yWw15g3Xc4ACLTN
-/SGQPL93m3qkyDFGDntrJwrPbg+SDAQG/NzYtPOQ8yWA8d62kwn9DOxgd7HumZoi
-8I+PGxp1Z4A1+SisHonXoSmhwwX6P8btKB3c/2hYLaoikICDXT707K0E61oHbSf3
-jpCGV+MeFEemaPOj0FxrH3LJ4ofGuzaToIo1b9eGBNz9YoC4q/EWxqb78jpPw8bp
-c7tj7lqftz9JbMvxPwUZHq9noFfpgwIDAQABo1AwTjAtBgNVHREEJjAkgiJscHd0
-b29sLXByb2QtbWluYXN0dWRpZXIxLml0LnN1LnNlMB0GA1UdDgQWBBTHi0oC+SaS
-VSASMRoOhZSb6u+L8DANBgkqhkiG9w0BAQUFAAOCAQEAvQ5BaMnza3JwJJu+V5UF
-U1ZYvCBn/TWc7ALet4xVcTdoxgq5FiKw8reYWGtijL5Yoi/V/roFFuiyjSeQYhKq
-6Vr7KmHktnsJn+/cQpzbyjBqo3LTaBtYqbucXlZrpkyy0e1Ia8aijNgbP1acvWfM
-oxvaNaulccXcbDc+x7XU51ihKeTg9UthoE6SBKyWdlCjJOJ7n/K4CHVegD0nVST3
-mcNaiB+aLmlSoII63FqK3VMRBmrlTQ1C3ab25fTDxlg/5NC6mVZbcDAe4poIReLo
-a9ooP6ZBaNOCD9BevPOlcZZGPGZBB8XOnZS8uREdpxtGAgucwZEchAru2lrYxzEV
-pA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lpwtool-prod-minastudier1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lpwtool-prod-minastudier1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIJALTp+wTwop0PMA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
-BAMTImxwd3Rvb2wtcHJvZC1taW5hc3R1ZGllcjEuaXQuc3Uuc2UwHhcNMTAwMjI0
-MTU1MTU1WhcNMjAwMjIyMTU1MTU1WjAtMSswKQYDVQQDEyJscHd0b29sLXByb2Qt
-bWluYXN0dWRpZXIxLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAx59TlYR92Fuzux/IiWYU3rv/fByvOlbCtiIFyfyLsV//YayVDv/mICYc
-/AiWxDW/Tq7rw1z/rgXvyYldvGjSuV2jOtpDVOIbTKHcZn8O9yWw15g3Xc4ACLTN
-/SGQPL93m3qkyDFGDntrJwrPbg+SDAQG/NzYtPOQ8yWA8d62kwn9DOxgd7HumZoi
-8I+PGxp1Z4A1+SisHonXoSmhwwX6P8btKB3c/2hYLaoikICDXT707K0E61oHbSf3
-jpCGV+MeFEemaPOj0FxrH3LJ4ofGuzaToIo1b9eGBNz9YoC4q/EWxqb78jpPw8bp
-c7tj7lqftz9JbMvxPwUZHq9noFfpgwIDAQABo1AwTjAtBgNVHREEJjAkgiJscHd0
-b29sLXByb2QtbWluYXN0dWRpZXIxLml0LnN1LnNlMB0GA1UdDgQWBBTHi0oC+SaS
-VSASMRoOhZSb6u+L8DANBgkqhkiG9w0BAQUFAAOCAQEAvQ5BaMnza3JwJJu+V5UF
-U1ZYvCBn/TWc7ALet4xVcTdoxgq5FiKw8reYWGtijL5Yoi/V/roFFuiyjSeQYhKq
-6Vr7KmHktnsJn+/cQpzbyjBqo3LTaBtYqbucXlZrpkyy0e1Ia8aijNgbP1acvWfM
-oxvaNaulccXcbDc+x7XU51ihKeTg9UthoE6SBKyWdlCjJOJ7n/K4CHVegD0nVST3
-mcNaiB+aLmlSoII63FqK3VMRBmrlTQ1C3ab25fTDxlg/5NC6mVZbcDAe4poIReLo
-a9ooP6ZBaNOCD9BevPOlcZZGPGZBB8XOnZS8uREdpxtGAgucwZEchAru2lrYxzEV
-pA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://minastudier.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minastudier.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://minastudier.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://minastudier.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://minastudier.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mondo-web.it.su.se-shibboleth.xml b/swamid-2.0/mondo-web.it.su.se-shibboleth.xml
deleted file mode 100644
index e6b83993..00000000
--- a/swamid-2.0/mondo-web.it.su.se-shibboleth.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo-web.it.su.se/shibboleth">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIB4zCCAUygAwIBAgIJAN5zNlbssq13MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEm1vbmRvLXdlYi5pdC5zdS5zZTAeFw0wODA0MDIwNzI3MTZaFw0xNjA2MTkwNzI3MTZaMB0xGzAZBgNVBAMTEm1vbmRvLXdlYi5pdC5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA92ZD35RNWkg5x8yaykgO4gAU2j7VPrCfl9ut461Tai9XFRyK+OWp5Ln+hXguW7VylGTfcEbOjjh51gAvxX310OwiohlLXmnBdwjfMmIhv8tOjHOjlZQSuYSGC0TFCvHJu/9cvJ285S1Itcg0iqTZWhC7fOlXyEBCTBTC5dHZr2sCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQDtazBSwFaLjM2ac/Zup8SCVouGN10jYpvpMfLZWtiThdLJS1Q0q2ayq91V8kMp02Y1Wt3ruZNbC3SE0U5CvAX/KpJaYuaFJWJO7YXvfeIJwau3ZmTG4CFlf0mjd419TWErju6PXeo6wcsmaZ6vEuse7fj3596LiC6sXwry+nNzUg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mondo-web.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <SurName>IT och media Helpdesk</SurName>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 371e7b00..1a45d2da 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -99,7 +99,6 @@
   <xi:include href="swamid-2.0/www.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/samsok.libris.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
-  <xi:include href="swamid-2.0/mondo-web.it.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/labs.swami.se.xml"/>
   <xi:include href="swamid-2.0/shibboleth.ebscohost.com.xml"/>
   <xi:include href="swamid-2.0/www3.genuinetext.com-shibboleth.xml"/>
@@ -144,8 +143,6 @@
   <xi:include href="swamid-2.0/www07test.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/sp.kau.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fordrop.irt.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/minastudier.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/ladok.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/bardo.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/unitcf.se-shibboleth.xml"/>