Resolves SWAMID-3693

5 files changed, 0 insertions, 206 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 2e63e958..23cff7f9 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -7,7 +7,6 @@ account.liu.se-shibboleth-sp.xml
 account.mdh.se-shibboleth.xml
 accountcheckout.lnu.se.xml
 activate-test.du.se-shibboleth.xml
-akka-anv.uu.se-shibboleth.xml
 aktivera-test.su.se-shibboleth.sso.xml
 aktivera.su.se-shibboleth.sso.xml
 aktivering.db.umu.se-shibboleth.xml
diff --git a/swamid-2.0/akka-anv.test.uu.se-shibboleth.xml b/swamid-2.0/akka-anv.test.uu.se-shibboleth.xml
deleted file mode 100644
index c7c7b560..00000000
--- a/swamid-2.0/akka-anv.test.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,87 +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://akka-anv.test.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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA användargränssnitt (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University AKKA User Interface (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration (TEST)</mdui:Description>
-        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration (TEST)</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFDDCCAvSgAwIBAgIJAKteO8AenOr0MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3V1Yy1ha2thMDA0LXQuaXRzLnV1LnNlMB4XDTE1MTAyMDA3Mjc1OVoXDTI1
-MTAxNzA3Mjc1OVowIjEgMB4GA1UEAxMXdXVjLWFra2EwMDQtdC5pdHMudXUuc2Uw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5Yykfh896zzlUMDkKfgP9
-bDEqGjRGLyIJaj+nDqtBzpStcqutIBbFhg59hkCO0rSQ7tTqAfiyTd+Tumu//+Va
-eP5cs98FPMePfRd53xYECQzIw4UtVAjEQJEgnhrtuW6izhKv8QBy7NE/+w44kwx1
-NyHnwk0LhkmPr8t131PfCqktOZ5zuRu/neqx99CPbsBLtFZ7Sq3YFBrQA8w5UhiQ
-EyHR3moUUYxOI/1QzjrEjBOM/3tRnX5JW1vYJUTuTPpOz3/xNUFYuD3WyVfIGS2d
-/qyDmfJF8W9WZHFosKszJ/ptsLFu1htS8M6X5NE75/Axw1Iq7j/tuf6Ie/PyyIpF
-898YdX7ZNb4SrjkaEK28uKmomXW3eA9OtJfzYZI2n9cKmaEHPP0clBDksyPn16q8
-6sAOq0MWOUUZ6/KnWPmZWczEaHzsvlsAdP715c4QjfRN0eh65T0gUJA8YcKqBIef
-qLaW4buj1udWFCfmH3V9DwOcedEU2v90Qxrn/Og7VUoCaaw05OeouRIxPVZVhyX2
-jCxWtVl1HWXDKcDDwh2q70B2TzCnlmHnEINxldAvAfy2vAW/BusCNxrLiscHdj3a
-1+N97p3xHrtMdUTEs1GsQVnVSNHxinshGiIis3lw+W5xuOnEVFpzBjad2oqLCj8t
-m2IzDvqYtNXE91fg0kwMUQIDAQABo0UwQzAiBgNVHREEGzAZghd1dWMtYWtrYTAw
-NC10Lml0cy51dS5zZTAdBgNVHQ4EFgQUUruxH3bOINDbPvFnLUaZzNmRTzwwDQYJ
-KoZIhvcNAQEFBQADggIBADY78qD6b3UWghVabhCLWLW9MPrMiV0FeKaOHOuQYERv
-DsU3//Nc9lwExqfOavsdQu5sWmjv8DwfJkmRxRz83qtFUlcPCc3NTRwLDkB/BFpy
-RUYXQtzbOfAJA5zHZvFeNVtgDNT+492BrdHlovMCkYEmYsEJbH+JlTuPK0qxwRqI
-mrPt0xTY/uTfr3WJWjUuDJfRXBqk7RduPE/OuRmJgR5y2YTuhD7xuH3g2n11Lcqp
-oDANE9jKgPeFD8otFNmDxb8vzFaHvxPN8VAJEzTbtA0ijvpOWFodlv/yVsn8klvE
-WSLRvWzSCXenOaSCaf4y92Fi4n0WjOXtWV4C7nkjrlO6ov9FxDo9U+p7PQ568T8N
-mt3qQBeVbAFb2McyyB4J8XSO2PGOZOfx/P+QREqCCSQK+vd5/WNZdU/O+QEVOA67
-xLEWZrA8ctG8LISaRvo25r6JAnwrQYF7RaCFCBmqBe1JYYdtEaiSVAbo1WKsxRub
-ijMA4vVFfH6jjSOnzquVyciKxDOaCNNT2h8qqBiVA1DyS0m3N403ebwNrzoFwGrk
-54g7VI1jtxz15prFXwN3yIaG14fUHsRiEAWu84QBAQ2wnufJNWqaLiHHUPDaxTpg
-lo0T4kERMhfIMpY98G4xTyJQrk6qqNItEsD8CWePbYFnlo+c2IxU9tvGM6sLA50k
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-anv.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA användargränssnitt (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University AKKA User Interface (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/akka-anv.uu.se-shibboleth.xml b/swamid-2.0/akka-anv.uu.se-shibboleth.xml
deleted file mode 100644
index a1e55623..00000000
--- a/swamid-2.0/akka-anv.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://akka-anv.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>
-    <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#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/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 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://akka-anv.uu.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA användargränssnitt</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University AKKA User Interface</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration</mdui:Description>
-        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>akka-anv.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=akka-anv.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAN5oCkisOOXcMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmFra2EtYW52LnV1LnNlMB4XDTEyMTAxMjA5NTY0NloXDTIyMTAxMDA5NTY0
-NlowGTEXMBUGA1UEAxMOYWtrYS1hbnYudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC9RBkxotLN9wNFPDlbM+HXCTFLC2rxdOI1McjZJjJ0MwJQ
-Qhju2m8CB0lrTb22nHd7ITqtzhVBKXHY0rmCm7j5tlPCDcQqzgHbk2KR7lGEv5JK
-oVXF7NdFRTxl393UX2a0+5aWUVsFrWIlHLK5ve+5HBdDUccWtX3XfR2HDcAvMNJB
-B2FuueVM6pwkNwsyNjDzJlrvtC3QsuLE4KdSjb2GGDg0xvIEgs+/d85JNk+yLhaa
-90zyQaw0L3OA7F8fX6EesiBg9tGirQcZ6cYHRVKuM1D4sO08iwRA0EA8iXnL34+5
-Caa/71lSR1Kzo1cluQKkzfob+9AzztZ3vdKxwNiLAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmFra2EtYW52LnV1LnNlMB0GA1UdDgQWBBQFsDy6A2U1Zby9p6ijIsBxv3du
-AzANBgkqhkiG9w0BAQUFAAOCAQEAtOsbz5YiPiR9xoQbIRr9BV3+fIxw07MNI2tU
-ouCtCW6wuFPvYARgGGCavPn/Hn2V0LWIo2VRpHizK9DbpFRU0ofvr3nJZKq+H45w
-WXmJLalTYyYnu6rwW7zmkbS30mMQ7J5aBawRNK5opSgbRp0eQt0ynyTgeJgqmACK
-gaUQmP5gD9lXDNdROqMjwANcMdU57NDRGWzASx01r+0LLaUX4NzTPlnOYldRPn0z
-JnhHj8Wsg0csCS86vOCTNXVKXHcRIUL5FaLf+8MrSHrs8WR4CN4AHLuprwthtQyV
-2nacKYU2Ke9STDjLkJSCmx/o8ZLfQPFLSCr1SjyYQzm21MOIZw==
-</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://akka-anv.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-anv.uu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-anv.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-anv.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-anv.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-anv.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-anv.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-anv.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-anv.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-anv.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/POST" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA användargränssnitt</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University AKKA User Interface</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 6d05e0c9..ee89c671 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -12,7 +12,6 @@
   <xi:include href="swamid-2.0/shibdev.rsc.org-shibboleth.xml"/>
   <xi:include href="swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/akka-anv.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/hades.slu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/urn-ibistic-prod-services.ibistic.net.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 5cf66d42..cdfcd936 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -51,7 +51,6 @@
   <xi:include href="swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-2.0/stipendier-utv.its.uu.se-stipendium.xml"/>
   <xi:include href="swamid-2.0/akka-adm.test.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/akka-anv.test.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/castest.weblogin.uu.se-cas.xml"/>
   <xi:include href="swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/konto.test.uu.se-shibboleth.xml"/>