SWAMID-752 Avregistrering service-providers

5 files changed, 0 insertions, 475 deletions

diff --git a/swamid-2.0/anvandare.antagning.se-anvandare-sp.xml b/swamid-2.0/anvandare.antagning.se-anvandare-sp.xml
deleted file mode 100644
index 6abdc784..00000000
--- a/swamid-2.0/anvandare.antagning.se-anvandare-sp.xml
+++ /dev/null
@@ -1,119 +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://anvandare.antagning.se/anvandare-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-05-22T10:26:29Z">
-      <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://anvandare.antagning.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://anvandare.antagning.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Användarbehörigheter för NyA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">User permissions for NyA</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Skapa och redigera användarbehörigheter i NyA</mdui:Description>
-        <mdui:Description xml:lang="en">Create and edit user permissions for NyA</mdui:Description>
-        <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
-        <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>anvandare.antagning.se</ds:KeyName>
-        <ds:KeyName>https://anvandare.antagning.se/anvandare-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=anvandare.antagning.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNjCCAh6gAwIBAgIJAKGhFHFRUhMNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmFudmFuZGFyZS5hbnRhZ25pbmcuc2UwHhcNMTkwNTIxMDcwNzA1WhcNMjkw
-NTE4MDcwNzA1WjAhMR8wHQYDVQQDExZhbnZhbmRhcmUuYW50YWduaW5nLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoGK7s9dCix35JLXXmzf57n/
-YWRXVjjpz3BPL40ElrInoA8ZsjCFC2LJTdw2okeY2pN5E+reUpqnHAnhv4pd9NBJ
-8ArZsDzT9fVoqrvF9S/vOpDJdjbR1+jCPjnfQXlMaAxNEjm12BGXwiPu1rY55/JQ
-Jw3gYvgkXIRjBoNiqrO7M5hJyzhHosClqYHuiglJp4FqZnqT04X/tJvr/EhGKfD7
-ymTqx51C7nzCH3YqJ+Of4pVFPXr098HCXQl4VNhsb7lqVUtUj7p4+8ysEZER3fWE
-fYRCKkjTohK5dHgSYhaY+UyDYaEUHYtCJkUrCRgtEL9RfhgFEG0U9rp5RI5UlQID
-AQABo3EwbzBOBgNVHREERzBFghZhbnZhbmRhcmUuYW50YWduaW5nLnNlhitodHRw
-czovL2FudmFuZGFyZS5hbnRhZ25pbmcuc2UvYW52YW5kYXJlLXNwMB0GA1UdDgQW
-BBQDj+/B0QPYH6kM3nZ/kYcEmsY6tzANBgkqhkiG9w0BAQUFAAOCAQEAcXeed1+J
-lILGzW5WG/o7rga5lzqaTnIy2XuM9mjDLHj/jAiFFWd4HiI06jo7G22nUag3pr9P
-hVk139rk3Y6kWWhn227ZSYzRVJ6FDNTKNAxN8SNbPieRul83d1gztuCWFTcLy9G4
-YD+9Wa6lNzS5XV9XIWWScklIBoELCbyeL1X6Q3OxPjVD+nmhr99HKOsokwM7ZEiv
-dbeZeDo/Z04TO6PultKtLd3iHM1GpliqaOPEwZBpey1oihh343l0YnQml5yqmRRA
-v0FNARh533QgZw/imNCwWTGWOj12xO19tqqNC9XvJIlapXuTpGn4ELDXhctYLv4o
-BXkD3pP3Jve52w==
-</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://anvandare.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://anvandare.antagning.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://anvandare.antagning.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://anvandare.antagning.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://anvandare.antagning.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://anvandare.antagning.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://anvandare.antagning.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://anvandare.antagning.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://anvandare.antagning.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://anvandare.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://anvandare.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://anvandare.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://anvandare.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://anvandare.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml b/swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml
deleted file mode 100644
index 490df2b1..00000000
--- a/swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml
+++ /dev/null
@@ -1,118 +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://anvandare.test.antagning.se/anvandare-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-05-15T12:09:28Z">
-      <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://anvandare.test.antagning.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://anvandare.test.antagning.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Användarbehörigheter för NyA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">User permissions for NyA</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Skapa och redigera användarbehörigheter i NyA</mdui:Description>
-        <mdui:Description xml:lang="en">Create and edit user permissions for NyA</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://anvandare.test.antagning.se/anvandare-sp</ds:KeyName>
-        <ds:KeyName>https://expert.test.antagning.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://anvandare.test.antagning.se/anvandare-sp</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDgjCCAmqgAwIBAgIJAIdZ25KHs8sAMA0GCSqGSIb3DQEBBQUAMDsxOTA3BgNV
-BAMTMGh0dHBzOi8vYW52YW5kYXJlLnRlc3QuYW50YWduaW5nLnNlL2FudmFuZGFy
-ZS1zcDAeFw0xOTA1MDkwOTAxMTFaFw0yOTA1MDYwOTAxMTFaMDsxOTA3BgNVBAMT
-MGh0dHBzOi8vYW52YW5kYXJlLnRlc3QuYW50YWduaW5nLnNlL2FudmFuZGFyZS1z
-cDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMok+3Qms6KPCetsxojx
-N01azrAqWXGuJBT8QfRvTMpGXrT7oX+GPDfhPsfaMTmdK8v5djfAQRtvZoZs3v2o
-jZgLPKRYWEcgXvTpi7+ZZEYxMzyTYmKMNWht6a8LOiTz1HlDdhuk4C6nImffLrcT
-F+5TXepJyJRFHCKSdXAMIDd45WnAJ7OHSBcwhS3OJGimMD+08cGgSYGliQcRB/LW
-rhaLXhY1SZd1B1SeVsJKeF/zr6iKcIb9CCqcNsq1tQsXAJIEaDHv0pmV4LpfNIeU
-GVnsdzWN9uKg+xwtF7OimoYbMR5lQTKEDAlt8vSVdy/TP2HPGgg/Xz695uV2o79P
-n38CAwEAAaOBiDCBhTBkBgNVHREEXTBbgjBodHRwczovL2FudmFuZGFyZS50ZXN0
-LmFudGFnbmluZy5zZS9hbnZhbmRhcmUtc3CGJ2h0dHBzOi8vZXhwZXJ0LnRlc3Qu
-YW50YWduaW5nLnNlL2Vjcy1zcDAdBgNVHQ4EFgQUPAhLCuNK1v95OEDR5z9AfCoa
-8AgwDQYJKoZIhvcNAQEFBQADggEBAAm7ZH8wUmPL24E/mxKKbeVSaJkNLOE1pkMG
-SWxgq1yoe5joDj0oODOPrEP6ulpWC1taaov/0ij5aZBa4tBS1LIXhB9NuivUIukl
-eEcry3Opz/HoX6oZ3OIdEfM1c/nZ93nCFiXpwOVUGHqWQ/Y9DlW8e7UqbEoqCkt+
-JzaZKzwt6unsQFcLFQI+2zlUyhOqUkZBTXpsNM2KvAnSeFYpl7IGVZCyamPZSvx0
-XLn+6vdlR0MViyQVYLg4pWkIbZNkvdZfwg9c2aHQKS5mRn6QXc1os5zciHJDUPa+
-UWCzPZSOrRKxWNKsWOsvuQSOKyn2fcKkXJkJfulVQpiXWaju5pc=
-</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://anvandare.test.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://anvandare.test.antagning.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://anvandare.test.antagning.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://anvandare.test.antagning.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://anvandare.test.antagning.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <md:Company>Swedish Council for Higher Education</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expertklient.antagning.se-ecs-sp.xml b/swamid-2.0/expertklient.antagning.se-ecs-sp.xml
deleted file mode 100644
index 85da7b8c..00000000
--- a/swamid-2.0/expertklient.antagning.se-ecs-sp.xml
+++ /dev/null
@@ -1,117 +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://expertklient.antagning.se/ecs-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-04T17:14:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <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 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://expertklient.antagning.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Expertklient.antagning.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Expertklient.antagning.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Expertgränssnitt till NyA</mdui:Description>
-        <mdui:Description xml:lang="en">Expertgränssnitt till NyA</mdui:Description>
-        <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
-        <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://expertklient.antagning.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://expertklient.antagning.se/ecs-sp</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDajCCAlKgAwIBAgIJALpXbM+qacPuMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
-BAMTKGh0dHBzOi8vZXhwZXJ0a2xpZW50LmFudGFnbmluZy5zZS9lY3Mtc3AwHhcN
-MjAwOTA0MTIxNTE0WhcNMzAwOTAyMTIxNTE0WjAzMTEwLwYDVQQDEyhodHRwczov
-L2V4cGVydGtsaWVudC5hbnRhZ25pbmcuc2UvZWNzLXNwMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAzAUziQsa1Lr6ZHjIc/WjThFLkt+LCAYCBMtHXiz5
-SEgOI3l7SIq1Rx15m+s15Sw2vMtKQ4fe/E4OBxER9+KyU0uDGuwivq5hqtRHahbr
-3ZaCTJNQHYXkSekBWlqEHuuvARG+QhqQ2afib6DnTSy9Tz5JYRckhvcNHLXiAJxD
-rcnvL7mm5AyAMD2EiUmlqJT/S9QKQcFiX/7CdALrLdMv7ACr9YiB7HBk34P+SZ6G
-xcdC2Q0J1s1hV2/vZ6aJEtAHpdJStbS6mIsazMnhAWKOGlXqBuRqY+fkuPx0VlGa
-IuVWlZr+c9Vvc9+rXjeJQWx9xVs7vhyD9/qurghDRNfGrQIDAQABo4GAMH4wXQYD
-VR0RBFYwVIIoaHR0cHM6Ly9leHBlcnRrbGllbnQuYW50YWduaW5nLnNlL2Vjcy1z
-cIYoaHR0cHM6Ly9leHBlcnRrbGllbnQuYW50YWduaW5nLnNlL2Vjcy1zcDAdBgNV
-HQ4EFgQU9tvB032jhHqPQD0FsTjMTW2Ui8gwDQYJKoZIhvcNAQEFBQADggEBACU3
-e8ZhRaBxQ1PUFx34MWEB8wanASs7GVLq9Wn3mAQe3mHfqm8HOcS8OZ8K1lGzfcBm
-1nep2ljyiPeTyQpfFGrEnxUNPs9KGeuMG/3Rx8e1NXMN2eWIFSPDSrs4OdiUhmI2
-cXrURLYbwX/Ulu/zodyIR8Wkf/sNJgU9Y7ybvO65YliK/Oy6NaRMEWh34n26RVEh
-VNt4lJLF86GMH9VLad7Y71rGC3D2Ka4Mt1/7uiiq9XODrdXiFsGEFGylWfXINKqY
-/YlePLzsgb6rdET16umm9OzMzqSOXGFizCcYjQbEnJXKM861mnB9inh8FZfKMsOs
-7UieK04UQvOTCP8j2F0=
-</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://expertklient.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expertklient.antagning.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expertklient.antagning.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expertklient.antagning.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expertklient.antagning.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expertklient.antagning.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expertklient.antagning.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expertklient.antagning.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expertklient.antagning.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expertklient.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expertklient.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expertklient.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expertklient.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expertklient.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">UHR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">expertklient.antagning.se</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">expertklient.antagning.se</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>UHR</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>UHR</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>UHR</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expertklient.test.antagning.se-ecs-sp.xml b/swamid-2.0/expertklient.test.antagning.se-ecs-sp.xml
deleted file mode 100644
index 93d46bce..00000000
--- a/swamid-2.0/expertklient.test.antagning.se-ecs-sp.xml
+++ /dev/null
@@ -1,117 +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://expertklient.test.antagning.se/ecs-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-08-27T09:27:19Z">
-      <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://refeds.org/category/research-and-scholarship</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://expertklient.test.antagning.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Expertklient.antagning.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Expertklient.antagning.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Expertgränssnitt till NyA</mdui:Description>
-        <mdui:Description xml:lang="en">Expertgränssnitt till NyA</mdui:Description>
-        <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
-        <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://expertklient.test.antagning.se/ecs-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://expertklient.test.antagning.se/ecs-sp</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDfzCCAmegAwIBAgIJAK82c2aIIaaMMA0GCSqGSIb3DQEBBQUAMDgxNjA0BgNV
-BAMTLWh0dHBzOi8vZXhwZXJ0a2xpZW50LnRlc3QuYW50YWduaW5nLnNlL2Vjcy1z
-cDAeFw0yMDA4MjYwNzI0MDRaFw0zMDA4MjQwNzI0MDRaMDgxNjA0BgNVBAMTLWh0
-dHBzOi8vZXhwZXJ0a2xpZW50LnRlc3QuYW50YWduaW5nLnNlL2Vjcy1zcDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALn59YjRNIgKAgWQI+I8espiOWxw
-5f2uuRgA8XpFswQc7xdeyAXaNpbdnnJ1i2uE9FEj4uS5Mlutx6ZjnorqILCoOeAF
-LcNeuZRU7qKis4rZ9+6xlMNd7Fk3VkqzYgMOX579z+mZGiP6MEwsLLvhMR44B+Wl
-I0BO5YJt1ZSp1RXi/5KtTXuzsySanxXjt/Zsr6m3HPpjqGd+zPBk2f8YBCoY9a2j
-pydNUP/3BTzWC+knWkXhlTqffpdMRJZmB3dbz/9hzPSMqnkEJ+/LLkFup3cvfoRp
-62Iok6VOFCgFv7vwlKeF7JWQFdovKw3/Dlnw5gGQ04WQ51mHj+jy7SC6CscCAwEA
-AaOBizCBiDBnBgNVHREEYDBegi1odHRwczovL2V4cGVydGtsaWVudC50ZXN0LmFu
-dGFnbmluZy5zZS9lY3Mtc3CGLWh0dHBzOi8vZXhwZXJ0a2xpZW50LnRlc3QuYW50
-YWduaW5nLnNlL2Vjcy1zcDAdBgNVHQ4EFgQUfnpPpzmASbKQx3G5Xww1k+p785ww
-DQYJKoZIhvcNAQEFBQADggEBADBzLMmkiDBg3vglk7kFIYo713Jk2aizr10prZso
-tPViKfKVHdr/fi8KdISrZog7cqkrzQtwU0V5FPDEsiGjKNsq7+2SFengcMqU1rvV
-SR9ctLeiC+T+8NnnPJT6R7vauTSbNAlrB94MxzFHEWXfxgeCZoBrsSP4TN2ZTybt
-zKl/GCRwlho32al2W72upcsSCsSkT41mxAEkcKIjWdhu9wsGFR9wIT+GviVqSvan
-5ALRfj456jJv0aNtV7GVUVeD8wOAaq+f9BwiQeoFeAt5MpUuGl9c51KnhOr85YfL
-YnU8oyIkvyTSaBD7+o4vMVOgBKTSWOxjWlGsuj0HmUAKkfc=
-</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://expertklient.test.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expertklient.test.antagning.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expertklient.test.antagning.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expertklient.test.antagning.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expertklient.test.antagning.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expertklient.test.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">UHR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">www.test.antagning.se</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">www.test.universityadmissions.se</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Universityadmissions.se</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Universityadmissions.se</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Universityadmissions.se</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 798ee144..819339b1 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -481,9 +481,7 @@
   <xi:include href="swamid-2.0/account.tst.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/backweb.test.antagning.se-hubble-sp.xml"/>
-  <xi:include href="swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml"/>
   <xi:include href="swamid-2.0/backweb.antagning.se-hubble-sp.xml"/>
-  <xi:include href="swamid-2.0/anvandare.antagning.se-anvandare-sp.xml"/>
   <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/account-idac.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml"/>
@@ -557,11 +555,9 @@
   <xi:include href="swamid-2.0/se.timeedit.net-liu-stud.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-liu-staff.xml"/>
   <xi:include href="swamid-2.0/hird.humlab.umu.se.xml"/>
-  <xi:include href="swamid-2.0/expertklient.test.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/edusign.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml"/>
   <xi:include href="swamid-2.0/permit-eu.caleaccess.com.xml"/>
-  <xi:include href="swamid-2.0/expertklient.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/gitlab.hird.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/antagningsp.slu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/moodle.media.nordu.net-.xml"/>