Resolved SWAMID-2565

6 files changed, 0 insertions, 232 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 5aa56535..46a23926 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -21,7 +21,6 @@ brainstorm.swami.se-shibboleth.xml
 cambro-test-26.umdc.umu.se-shibboleth.xml
 cambro-tst1.umdc.umu.se-shibboleth.xml
 cambro-utv1.umdc.umu.se-shibboleth.xml
-cas.weblogin.uu.se-cas.xml
 cdn.nordunet.tv-shibboleth.xml
 ci.nordu.net-shibboleth.xml
 coip-test.sunet.se-shibboleth.xml
@@ -45,9 +44,6 @@ expert.antagning.se-ecs-sp.xml
 expert.nyautb.its.umu.se-ecs-sp.xml
 fordrop.irt.kth.se-shibboleth.xml
 gallus.scilifelab.se-shibboleth.xml
-grouper-test.its.uu.se-shibboleth.xml
-grouper-utv.its.uu.se-shibboleth.xml
-grouper.its.uu.se-shibboleth.xml
 hades.slu.se-shibboleth.xml
 hbidp-test.test.hb.se-idp-shibboleth.xml
 hr.liu.se-shibboleth.xml
diff --git a/swamid-2.0/cas.weblogin.uu.se-cas.xml b/swamid-2.0/cas.weblogin.uu.se-cas.xml
deleted file mode 100644
index f6d13eb9..00000000
--- a/swamid-2.0/cas.weblogin.uu.se-cas.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://cas.weblogin.uu.se/cas">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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://cas.weblogin.uu.se/cas/login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Interna tjänster vid Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Internal services at Uppsala University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets centrala autentiseringsservice (CAS)</mdui:Description>
-        <mdui:Description xml:lang="en">The Central Authentication Service (CAS) at Uppsala University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCjCCAfICCQCBoBzel14oojANBgkqhkiG9w0BAQUFADBHMRswGQYDVQQDExJj
-YXMud2VibG9naW4udXUuc2UxGzAZBgNVBAoTElVwcHNhbGEgVW5pdmVyc2l0eTEL
-MAkGA1UEBhMCU0UwHhcNMTQwMTI0MTMwMDA0WhcNMjQwMTIyMTMwMDA0WjBHMRsw
-GQYDVQQDExJjYXMud2VibG9naW4udXUuc2UxGzAZBgNVBAoTElVwcHNhbGEgVW5p
-dmVyc2l0eTELMAkGA1UEBhMCU0UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC138nteJ5dTxu3rLx9jw9uu0Rz+HcWKLqRfaA9JjD//kgMHXpe1vIcvDrU
-K0keX8Wu6md1WQxMMmz/HW9+1KVFhHfLYKL8xMJed5FCE6ih984bzhWOxU0d8cJj
-5W5PGvmGIm3Zyl70O2Q8VDV1Rtefed7aY+mQZ1Db2PX5Us+YWnyfjHn2N/d72LzG
-IGG1VPAaecYQoouSwZCHWOfBsVPAEtnkKdNweg7hUBmSgErZsmXC15y1vh/uNPOt
-IyD8Mv4G/S9KvIlmJMvjQRACrE3gLlITAWAgE00EyhQ8TdvnSf94AKpNbzSLiEtn
-Cbwfjtf5tQvWJEmJ1ZRWOjtXGumTAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIjN
-p+8HerQA4JK+KZ7f2hyqcUR8G0VW+98kklSj8LJSF9DjGV9XIPTmKPwCcb/Er3JT
-9yzhK8VjvwckgOYJhnSb7hCOjMiHh0OIQv6NZENw5lmQCF3XCh30IVIPrNmnlKvc
-78PM/2ARbplr+R8oEvc5b04OfrF9aiEeci26kwFK6fjfIKNeJVZTeTwiYkQdU0cU
-epJE1LBEi19LFH134WSMiKJdw+TmCrcHrs5XIWEuRBriQ2idMW9qDsAlly+MfKkg
-a368qzmxvw5isN7tiDionmjZ/p8oluCN9SjKWIouYWqQ8Mq1xQ5jcF7WCtq2HUVi
-5aPnHGod+Swv78pbujw=
-         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.weblogin.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cas.weblogin.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/grouper-test.its.uu.se-shibboleth.xml b/swamid-2.0/grouper-test.its.uu.se-shibboleth.xml
deleted file mode 100644
index 645e4d22..00000000
--- a/swamid-2.0/grouper-test.its.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,59 +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://grouper-test.its.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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://grouper-test.its.uu.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">UU TEST GROUPER</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">UU TEST GROUPER</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna Grouper för test</mdui:Description>
-        <mdui:Description xml:lang="en">The internal test Grouper for the IT Department at Uppsala University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>lagopus.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lagopus.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAJwLNDNAvdwVMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWxhZ29wdXMuaXRzLnV1LnNlMB4XDTEyMDIyMjExMTgwNFoXDTIyMDIxOTEx
-MTgwNFowHDEaMBgGA1UEAxMRbGFnb3B1cy5pdHMudXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDIc2xP8hCNliluyW/3kFHw8/EYMmGu4FvKFbCh
-33+QDDdZWQIDyZUo/GIw/DdRdkDaRaQ2JgF1zofooPlkYrqd5cBaoxc+oEet1MB+
-J70hvt+83IuzVdp4VNxAiGy9L5aAfnXdsYV2AHZisoHKyeAX2XNlUC4VA9dKBWJC
-O2dUjDCxZ52R6E8P0CCZ5zKUA6i/nVJzpjklaQDT67Fyb0p14Aqzw4092ykUXbys
-KOFZ11QmuzTN0r3+jTsUHICakgsSyUNTnwQKNfE8TAHj+WPFhfzTKMcSWEpYI7Rj
-FfkNFSMem7oV26V7RuE3KoXTtrCXlFBzt3014mQWEb5+ve7hAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWxhZ29wdXMuaXRzLnV1LnNlMB0GA1UdDgQWBBSzeuO1UGd9noyM
-fwfJ93JJacVEaTANBgkqhkiG9w0BAQUFAAOCAQEAWhy3C+EjI2SqeftECTKBZb1D
-C6DInq/e0nB9Y9cvKHxzZdX9TKDcfozjBw91B+1GhEMZIuIPS8fPMpwLc3OOX0lf
-KS/zEjUbl47rWlpYMApXopQGR718vuOeqFh25s6goFD4axlS4Be1YHr66JCTuKs6
-6XqCqzPvKgI6DWqu6Qi0aLBuZUuZGfotLRBLPQtjzWiDsBzRLNa89majbg7drwgj
-oQFShIE1qtNWMZ7gYnXyPXDuE8ru8W2i/NrytzLHJN/NzEOBid4VzRHG+XAO4+bK
-Jkes+PA+V+YNBFaZc6S+0YsiqsedpDewqW0HB/SzVIgIiiBRCu/4lfR9eqWbVA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper-test.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper-test.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/grouper-utv.its.uu.se-shibboleth.xml b/swamid-2.0/grouper-utv.its.uu.se-shibboleth.xml
deleted file mode 100644
index be4c8b46..00000000
--- a/swamid-2.0/grouper-utv.its.uu.se-shibboleth.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://grouper-utv.its.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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://grouper-utv.its.uu.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">UU UTV GROUPER</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">UU DEV GROUPER</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna Grouper för utvecklning</mdui:Description>
-        <mdui:Description xml:lang="en">The internal development Grouper for the IT Department at Uppsala University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>laeta.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=laeta.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAPhqmNfCXoJdMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2xhZXRhLml0cy51dS5zZTAeFw0xMjAyMTQxMDI3MjFaFw0yMjAyMTExMDI3
-MjFaMBoxGDAWBgNVBAMTD2xhZXRhLml0cy51dS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAL4zBv8DXuK32BxPmgj1ecXRfZe35OwJprelf4tZ25IF
-gUw5wy6YJG1dwA0rRyZTvRDgGcSjCpUtO2AAqRASM3BzvnzMJdg8aIi70c33KvvL
-486fKpfc3oUfnZ4s1WBOFiqeYAmzz85YL6F830yRw7UdN9/ysJPCVC2qilAKM7RI
-iOwcrZIb8prxvoVDRFsV2wGjRP/YIyVO41ObfdWkg+tB7X7DRz127S5Mqga/YlJk
-O0NLXv4DqSqAkv9tYpTJKE0UG6oh5B9dtbtEfLYMLGamDv7y82jvmjW4qaY+Gu2G
-2yYqkon3ILleH4mk3Vath9qRRqEQVRE61xtoH0ZpADUCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbGFldGEuaXRzLnV1LnNlMB0GA1UdDgQWBBSyozmFibzGVWSCCyw/Ek5+
-PFmlgTANBgkqhkiG9w0BAQUFAAOCAQEAJ9RJgL04YiZhJFVrPHzv4QPWtHN4BRoN
-MUQeXlzQ9iz9ksl/0eN0XKJuzo5HbG0067w1OUzpZUEM8GVtBCTpOlqAJJA6lb60
-r+3KbUEejZyPZeHh9xFh1tlPkZLmn7bj/ucfTdBACRbXYniWAOn98wV1wd4eGLVG
-/VyoVi5bUhq5tCOhp5eO/xWM0gBCeRt760hZWDQ5/sgd4nkrS1Se7zWejG7Ph+Cx
-OH5QMcOlj81+M7N3qUU//X8ypY42+QHc0gUQEB8BJAzatIdjIjipoT4fhk82E84q
-p9ItgP+bXhVORPr8DiYsTGUr5vfs7Q4e7etZRBJC30LQiGaerGc80Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper-utv.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/grouper.its.uu.se-shibboleth.xml b/swamid-2.0/grouper.its.uu.se-shibboleth.xml
deleted file mode 100644
index 779d19df..00000000
--- a/swamid-2.0/grouper.its.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,59 +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://grouper.its.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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://grouper.its.uu.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">UU GROUPER</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">UU GROUPER</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna Grouper</mdui:Description>
-        <mdui:Description xml:lang="en">The internal Grouper for the IT Department at Uppsala University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>lory.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lory.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAL1RGIih2dp/MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmxvcnkuaXRzLnV1LnNlMB4XDTEyMDIyMjE1MDgzOVoXDTIyMDIxOTE1MDgz
-OVowGTEXMBUGA1UEAxMObG9yeS5pdHMudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDfaJDQjzXaGpYLPN8oiu76Ck6yPiKT2mzXNLDC6gl6qcKd
-B8q7eBu7QW4/WqYD69XdhUkIiPiG1eNu1uXEuF/lBDmOGQ9O9sQoMOaNYWQofwtF
-6yKUgnm4T42rNHYZ5mGFt7RfH+380s+d2M7HMh+OApCbRuu5FMVyITKmtroTkYof
-+86LJDq7GzktkGaRHn+5mXDg201c5LsCfDG27V+eIAxjeN0a4BlAzNDwynmX7Tmq
-VacNvFdreBIAXjU4CNQ+fPccUd8Dyst0Bb2mPMCUqlyxn0cILDc+Q9Iv4KO7czoG
-XdkANIfqS7YWgaxtnBFVtu25vps/h8hihwE/RcobAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmxvcnkuaXRzLnV1LnNlMB0GA1UdDgQWBBR7usKPvDlmkEuaKS1bVoLokZAx
-8zANBgkqhkiG9w0BAQUFAAOCAQEAJeHoL4LRFh2W5WUrLH6o2BjezwajXIZxNtHH
-OBIbdU6zGebAFVMd8ILlZJCWceOYb8aT2NpZsNBt6Of+bXRgT95vk8P3rgfghAAm
-m4RVMmI0E3Sg7upppdp0UvUdff/01QP4jMEif9zqO1CB8HwDe7qPd2zIlSg4hVXA
-VTYITlhc2HTLdhLLeqq2kkO8uoh7Deb2+om56Wq2UG8JFLDiwQuTiil9bmDs7635
-J97muJOIk72pZ7M+z7aRmbGqaZmX7lVcn2ipqR01Wt86IncZ8N4+KHvL1bd8Ot+e
-0C2Qlb5+9FE8h6CiVCxRMBaxUsVFR6knlay131nUecMwLC3G7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2cb85a09..964a05e7 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -178,15 +178,11 @@
   <xi:include href="swamid-2.0/wiki.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/grouper-test.its.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/grouper-utv.its.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/grouper.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml"/>
   <xi:include href="swamid-2.0/lartorget.sll.se-shibbolet.xml"/>
   <xi:include href="swamid-2.0/hr.liu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/accounts.bils.se-saml2-metadata.xml"/>
-  <xi:include href="swamid-2.0/cas.weblogin.uu.se-cas.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-8087-sp.xml"/>
   <xi:include href="swamid-2.0/samltest.swamid.se-coc-sp.xml"/>
   <xi:include href="swamid-2.0/samltest.swamid.se-nren-sp.xml"/>