SWAMID-448 removed 5 SP:s for umu.se

7 files changed, 0 insertions, 598 deletions

diff --git a/swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml b/swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml
deleted file mode 100644
index 0e5fddcf..00000000
--- a/swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,146 +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://bdh.demo.its.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-04T14:10:22Z">
-      <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: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://bdh.demo.its.umu.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Bedömningshandboken Demo/Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Bedömningshandboken Demo/Test </mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Bedömningshandbokens demo/test-miljö</mdui:Description>
-        <mdui:Description xml:lang="en">Bedömningshandbokens demo/test-miljö</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://bdh.demo.its.umu.se/om-bedomningshandboken/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://bdh.demo.its.umu.se/om-bedomningshandboken/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://bdh.demo.its.umu.se/om-bedomningshandboken/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://bdh.demo.its.umu.se/om-bedomningshandboken/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="83" width="83">https://bdh.demo.its.umu.se/static/gfx/uhr_symbol_lila.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJANHQqF3Mbs3CMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
-BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDFaFw0z
-MDAyMjUxMjI1NDFaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
-ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAM5L4cIRxGtWahSPBEIX
-D76addYg69ByTUteOI80QEVREf/b7m7dDg6AUXHCNk3h4haM61pMUoh+ii0HxH6m
-3+lGGA1BlOgY70Spj7EwkI1EEJZfdd+1Ywyfaqd0xwlXuB5ZILtg8dByyyQ89Did
-yg3VrwAYPebK1iaKXXtRP0OsUQXWs8ugguxNdsJ074TXsANCLvreiVoTJ2VcOYgc
-0IsNfpxhY/Lo4TiB1Ku62RCD9kP9C4duGFSG+VrPgWIGvn3PDyw7YKMKAFRUI6dx
-zM8uSlg+PrA/JSEUEsOtnKsBATuLOJCcFsB2vZIBeRbHG53MuM2YHpBa+FiFfWoj
-o2ONdIq3uZk3KiaXGqTrNZxKf3dW89nrfm/IuftqVs8cmv1zWcGUmlCLXZ2SWkn2
-CdC7F/ZScz85LZJ/rX8MiKWygUL78Gxm0dffx4CtVX1WYkHqniHOPgPBAttLr2oB
-KbJLj+ugUAvhEn99iorrtrjPU+Ey7YHQcIEuntgxnYzVmQIDAQABo0YwRDAjBgNV
-HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFNVLrfTg
-dfzN8FOQ5XLPpVe4qyaVMA0GCSqGSIb3DQEBCwUAA4IBgQA3pi3hlMJuc6O+qfpA
-FCFzQtMaKldYrO+0E5ZOzBo6N3HV5oUIK9s6e9wo3D/e7qrbfqPyf+8neAfxqyo0
-ugKlHKlA6IykFdX+0JLg3bfghrfsBqCBAsKx3crgMpAEF9CfHQiGN+pdlYuqQA6X
-mik9l3ZaK3BnH3+9T5337uiYSwKQcsNwo5E6hImfinOzLnYny1QLI/0hpBt6IFpY
-Iv85BTMxpVal4z8awFTKer4ThX1B/NM/beTpetooDILX1elIUZ1vLrLvzoyt+e6k
-sinXW4kA7vxrPpzutvPcTEN58sdSNVEP9n7jaEjkw3bp+BRpFKvqzzIPsByb1EdG
-RbPZ78tkYGz+Kz68zAjdpG70G6XGHiUKIDijceYXvu4jpk5FvhRMue4km7mKipjY
-rzPNj9qEZVSKA/aRMcgrji/gmwkljut3AGshBQK/Vcstf8q4LM+hpJtLwhA/z4Uv
-bIQCFPm21t8oXXqwFgsCPBdI3GKnueUCa4NVU54cDubC/38=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJAPVopcz9TYRqMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
-BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDBaFw0z
-MDAyMjUxMjI1NDBaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
-ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAJW8n1E/iwIwr0Oxnxix
-P/cC4H8Dep97H52MLbDjFVrUnrMBsUj3Bkrn17OKQWHaGeb31t9xgV/qcF2Q1lau
-QIWoik7kuG9vxaLDYgPsg9bmo21MxxyxTq/kqv/QgWtjFiRyCMBJoADo16LuqVne
-7FSk/gjqNB/p4Zl3/8Xm/uMrYzvMh9y+ZSYUKhPaT/6nytdvPRo7w/DsgRNmDEr0
-g1eBC5Dt0D52owESfyhYeOjOOvNlxG2cSf0vM2Qv8A25YA4+z+df9JjNppBfnUlO
-DEQqZ/FMijb5t93MxSb1EY3dKAfnj9Ghl49yuDHaaLZJagp8RcBgwZbnrB4JoLUn
-zygCkuZi9WZEHRG1wL6Eu2LN2zI01YdewEaPE0oQI4XxwfyS1KKIllICBEwRJcW4
-Oqb77Fbne04vbkXudCJzOtjSjgkqu7M1Prb1SnIMOSpsa/FYM91mSA67tniNQ2Cw
-7Yi8UnMoJ/xSEegI5PX6CzrCqSnHX2pbLlVz45Il/gn9BQIDAQABo0YwRDAjBgNV
-HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFFDjqqVs
-c+eciHvKv6lRUWGs9J2VMA0GCSqGSIb3DQEBCwUAA4IBgQBqQ6Zo7uPfd0cQ8Mg4
-RZPK+aUh5nnLjCGtirgXEPfOsABDTl6WaWaT3UowcFJVerJsEjxeG3j/OFZeN6RH
-944+GWYV0rh6Kd9tPxHMt0bCGm2y5X0GNegsz101FjkxQ0ptufCHjjT6nGuPBKmy
-xg9xbx0AIZfvY9+8ukQG9ICxc3yaWhfwPSvZiSRguQsn6WkNAQazuq/gZ51QV8fn
-r7jIA7P/4QTcc1oxITG107OrhPWVLF14pU5wX9x1mkQh1AZ/cuCxU3Plh11DPzsw
-72A3RJq/JfcFfiS+s0eZhvLj4bZRE72fAvJagmch05EDSxTR5dVkL4blJ+UBrkYL
-8wcAFySPmX2B9APEBpxG9bQBRdefcZ/LHt27sO/1u3gK662JBxAgeS8V72QWRPbu
-JK6qeJIQLyvDHXkt5u6UxFnJfW7JNiH6DmJw5oUDIMQWgfXvl+y8VVryU7R9txD2
-KW3i0DN94dcdT/QUFYLJBwV+9zTb9jK+yNWst2xyRDEAVcY=
-</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://bdh.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bdh.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jimmy</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jimmy</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jimmy</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/dbhprod.uhr.se-shibboleth.xml b/swamid-2.0/dbhprod.uhr.se-shibboleth.xml
deleted file mode 100644
index 6b670db4..00000000
--- a/swamid-2.0/dbhprod.uhr.se-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://dbhprod.uhr.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-18T23:09:57Z">
-      <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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Test av ny produktionssite för Bedömningshandboken (kommer att få denna URL vid driftsättning: bedomningshandboken.uhr.se)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Test of new production site for Bedömningshandboken (will get this URL when released: bedomningshandboken.uhr.se)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test av Bedömningshandboken</mdui:Description>
-        <mdui:Description xml:lang="en">Test of Bedömningshandboken</mdui:Description>
-      </mdui:UIInfo>
-      <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://dbhprod.uhr.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://dbhprod.uhr.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>uhrepiweb02.i.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrepiweb02.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEAzCCAmugAwIBAgIJAOdBqacZ4/EFMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHVocmVwaXdlYjAyLmkudWhyLnNlMB4XDTE3MDExMTEyMTgyMloXDTI3MDEw
-OTEyMTgyMlowHzEdMBsGA1UEAxMUdWhyZXBpd2ViMDIuaS51aHIuc2UwggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDv6EgQw6o9Umqd16VMHb3PBMYw+bxy
-2dGv2EPMYAFHjMpythOVvyTrXtA9dgB1Zww77yysuvE5s5+3bEuiZywKtlJ3pWPd
-tn59T8dl85MOorrq0RzKHcXCDF6s7tMTdcV8M4sBC/H9aGmKnHgm0Y617rgfGv5P
-muilDwvktEqafohLce08DZEMWGJBh9jUSEZ/S/Wn7PO1GBX2QA9oHotZAqevR06v
-YaffEG0kEIrQt64uhF0bSBZCfhp0J+SBMk0Wvsma2ckpZ7eRUcET9h7LKn71KIJ8
-1sCocpbn+3JDzhD2uBiYyQaR15Ijfdq8iqfbkX+hmPm0D5/wU3gpuPKuG1UHsAmE
-kEsDPifSFJSbgTLVw+vFFBXqKA+/hWidtLgP4XVNgFI1GB8J5Ly+fMn2bXfH8CwH
-HpffzdGNznYiY0WeJX+lsw9dVFIaCrn5PTZiT0jC+kFvP856UE18QbkL1emi8WrJ
-ptrarp52vCoklBE3zHyJ+rjaKR/zVUKZldUCAwEAAaNCMEAwHwYDVR0RBBgwFoIU
-dWhyZXBpd2ViMDIuaS51aHIuc2UwHQYDVR0OBBYEFOfeY2rg/PgZ2fgEOk2v2x0w
-VnSXMA0GCSqGSIb3DQEBCwUAA4IBgQAGwaIX03w9j4Zm0bIne3Elo/3WVCVdZOev
-ZIX6tq2Fio3+YpnAH+L3sO0FROTRGuxUusJOUWnYJDcVIHOfgzUU0eTa9o/S+fdG
-XNKSeNizrBhvYIRxqhY4tyXhQrp2gEQyUR6LT9rA+X5yYMlrajp2M/Kav1/2sfF4
-EKRAkrCY2eU0ZeI5JwaopzwMYiKxpyoqipUPqFu28xabijrGx6vgbzEfT42Bz7lg
-Q3WUc+tUWPyL9fqGw0FZySSQwks95fXZlQezu1kKHDiptiX2u8lfW3aPbT2PC7ek
-CwsF12e85+5pzfygrHWG9A+hKv49Dt6uTYnYrnv0aQRvAXOwUQ6ZIwKVy3/IISuM
-PI0Bmb7LkjvTr24EPa24S6YMvD+utfgh+MjSnA5lHdDvTtZheoqyoI5haeQ5MMI5
-LKZPDKEVmUXoIJA24fs/pj0RL5nBDYiRobwK1TpM633Ae+NhPDqD0o1JdgPUV3Vg
-GCB2r29GXIAUYaUyAdsWXNMFG6lb7IM=
-</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://dbhprod.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dbhprod.uhr.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Erik</md:GivenName>
-    <md:SurName>Jonsson</md:SurName>
-    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml b/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
deleted file mode 100644
index 7631de52..00000000
--- a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://its-pd0384.ad.umu.se:4444/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-08-29T16:00:04Z">
-      <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">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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://its-pd0384.ad.umu.se:4444/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Utvecklingssite för Bedömningshandboken för Erik Jonsson, ITS, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Development site for Bedömningshandboken for Erik Jonsson, ITS, Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Utveckling av Bedömningshandboken.</mdui:Description>
-        <mdui:Description xml:lang="en">Development of Bedömningshandboken.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID2TCCAkGgAwIBAgIJAJyty8F96nJvMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV
-BAMTBnVtdS5zZTAeFw0xNjA4MTUxMTU4NDBaFw0yNjA4MTMxMTU4NDBaMBExDzAN
-BgNVBAMTBnVtdS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAOzl
-REcan9yHtz2zZM0HOj4/mv310xhEVOWrfQddoFw72baKvVhgl6bWB8WcqTJPSsAR
-iww6B31QQ61oa95Q8zQrIMZ+hwApgZt9I+4wrBG6RJMGHX61IdRlthRUwuBOm9mM
-aASfnzu1mx/SLE27QVQQEAS7l/UUUy/O5CgJ2hwlH4+dY37THyvPUNyKtuaxxB2o
-9Q8WdKs2LYU3UF+MJGdHaBCJf6SGQxNkqYDy8ESy2e812oNxopFTE/eF2wSjYJ6E
-tCVSwich6YnRPxWt3dv0tq6QwW+ZbE1qldVjoicZFuyTPcpZrDB4oEot/M2ruVW3
-pXVOn2vo/pl4xMiYwkpMclgAXo5A8Z3OTwGPYFo1FXTuh6K0qn9GJGyFPTskDbSz
-1NkNJ2wiVYxKs6EEiXjZqHQ/yJNdYRQQQPYiadjiovp2NOQmi9fLXtNL3bGcwHhy
-znCWmcrBLz6STh5jF2ItevIQ1JcCKtMd+wa/GTTC2tJ6IcFPAl49sJWb2qyJDwID
-AQABozQwMjARBgNVHREECjAIggZ1bXUuc2UwHQYDVR0OBBYEFA/BlJMv7sWFIwAv
-ZIuxtvqbm5koMA0GCSqGSIb3DQEBCwUAA4IBgQAJb4YSwiLvF8FRHiZGRmcsuYIx
-c4/Fcwrzw9ZB41oysmvnh0+K5EQr3csbV3bsnhJCj88DxAnQlFUPREPqJ+jDaHk0
-oOcxZwONLW6XF7CZx0NDc/cAatJiDwEsuvBBpjBeFfTWFe83Z7aliATcOSjcjU55
-+34U831R3zMydy6vIUb970OmIRaoxZAcgZtjeXNXRAfkH/7aMqPdaKPt9BtAfpae
-kSNs4X3S0p7XQKaHSHkbtUzVdIWCiheK+Jy0ZtVMUKMTcT7V+My0h+4+UBFLmdmq
-mrVPMvMk67QjyeX/9fkKETTXmbxePefhrbYl3cttdDtn0GHjeryMAhR0AGXoBt5r
-rw9RLPaIuyXzRiltshq59V1ydRa29dKjRoZ1FoosARIw6bWOsqW+TULCEOEy331h
-dfFvrSBEc4oqy+doOo9a7AUjn+wi9ZnKb7OifNsbXSrzKjSniD8NJvqgOp2Ss7wB
-R8goZylfLlaYH0RQyMuClSC5BJlBB7yL58kraKY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Erik</md:GivenName>
-    <md:SurName>Jonsson</md:SurName>
-    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907869295</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml b/swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml
deleted file mode 100644
index 329d9281..00000000
--- a/swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,146 +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://nyas.demo.its.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-04T14:10:22Z">
-      <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: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://nyas.demo.its.umu.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Nyasidorna Demo/Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en"> Nyasidorna Demo/Test </mdui:DisplayName>
-        <mdui:Description xml:lang="sv"> Nyasidornas demo/test-miljö</mdui:Description>
-        <mdui:Description xml:lang="en"> Nyasidornas demo/test-miljö</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://nyas.demo.its.umu.se/om-nya-sidorna/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://nyas.demo.its.umu.se/ om-nya-sidorna/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://nyas.demo.its.umu.se/ om-nya-sidorna/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://nyas.demo.its.umu.se/ om-nya-sidorna/personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="83" width="83">https://nyas.demo.its.umu.se/static/gfx/uhr_symbol_lila.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJANHQqF3Mbs3CMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
-BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDFaFw0z
-MDAyMjUxMjI1NDFaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
-ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAM5L4cIRxGtWahSPBEIX
-D76addYg69ByTUteOI80QEVREf/b7m7dDg6AUXHCNk3h4haM61pMUoh+ii0HxH6m
-3+lGGA1BlOgY70Spj7EwkI1EEJZfdd+1Ywyfaqd0xwlXuB5ZILtg8dByyyQ89Did
-yg3VrwAYPebK1iaKXXtRP0OsUQXWs8ugguxNdsJ074TXsANCLvreiVoTJ2VcOYgc
-0IsNfpxhY/Lo4TiB1Ku62RCD9kP9C4duGFSG+VrPgWIGvn3PDyw7YKMKAFRUI6dx
-zM8uSlg+PrA/JSEUEsOtnKsBATuLOJCcFsB2vZIBeRbHG53MuM2YHpBa+FiFfWoj
-o2ONdIq3uZk3KiaXGqTrNZxKf3dW89nrfm/IuftqVs8cmv1zWcGUmlCLXZ2SWkn2
-CdC7F/ZScz85LZJ/rX8MiKWygUL78Gxm0dffx4CtVX1WYkHqniHOPgPBAttLr2oB
-KbJLj+ugUAvhEn99iorrtrjPU+Ey7YHQcIEuntgxnYzVmQIDAQABo0YwRDAjBgNV
-HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFNVLrfTg
-dfzN8FOQ5XLPpVe4qyaVMA0GCSqGSIb3DQEBCwUAA4IBgQA3pi3hlMJuc6O+qfpA
-FCFzQtMaKldYrO+0E5ZOzBo6N3HV5oUIK9s6e9wo3D/e7qrbfqPyf+8neAfxqyo0
-ugKlHKlA6IykFdX+0JLg3bfghrfsBqCBAsKx3crgMpAEF9CfHQiGN+pdlYuqQA6X
-mik9l3ZaK3BnH3+9T5337uiYSwKQcsNwo5E6hImfinOzLnYny1QLI/0hpBt6IFpY
-Iv85BTMxpVal4z8awFTKer4ThX1B/NM/beTpetooDILX1elIUZ1vLrLvzoyt+e6k
-sinXW4kA7vxrPpzutvPcTEN58sdSNVEP9n7jaEjkw3bp+BRpFKvqzzIPsByb1EdG
-RbPZ78tkYGz+Kz68zAjdpG70G6XGHiUKIDijceYXvu4jpk5FvhRMue4km7mKipjY
-rzPNj9qEZVSKA/aRMcgrji/gmwkljut3AGshBQK/Vcstf8q4LM+hpJtLwhA/z4Uv
-bIQCFPm21t8oXXqwFgsCPBdI3GKnueUCa4NVU54cDubC/38=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>uhr-webstage01.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhr-webstage01.ad.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJAPVopcz9TYRqMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
-BAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5zZTAeFw0yMDAyMjgxMjI1NDBaFw0z
-MDAyMjUxMjI1NDBaMCMxITAfBgNVBAMTGHVoci13ZWJzdGFnZTAxLmFkLnVtdS5z
-ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAJW8n1E/iwIwr0Oxnxix
-P/cC4H8Dep97H52MLbDjFVrUnrMBsUj3Bkrn17OKQWHaGeb31t9xgV/qcF2Q1lau
-QIWoik7kuG9vxaLDYgPsg9bmo21MxxyxTq/kqv/QgWtjFiRyCMBJoADo16LuqVne
-7FSk/gjqNB/p4Zl3/8Xm/uMrYzvMh9y+ZSYUKhPaT/6nytdvPRo7w/DsgRNmDEr0
-g1eBC5Dt0D52owESfyhYeOjOOvNlxG2cSf0vM2Qv8A25YA4+z+df9JjNppBfnUlO
-DEQqZ/FMijb5t93MxSb1EY3dKAfnj9Ghl49yuDHaaLZJagp8RcBgwZbnrB4JoLUn
-zygCkuZi9WZEHRG1wL6Eu2LN2zI01YdewEaPE0oQI4XxwfyS1KKIllICBEwRJcW4
-Oqb77Fbne04vbkXudCJzOtjSjgkqu7M1Prb1SnIMOSpsa/FYM91mSA67tniNQ2Cw
-7Yi8UnMoJ/xSEegI5PX6CzrCqSnHX2pbLlVz45Il/gn9BQIDAQABo0YwRDAjBgNV
-HREEHDAaghh1aHItd2Vic3RhZ2UwMS5hZC51bXUuc2UwHQYDVR0OBBYEFFDjqqVs
-c+eciHvKv6lRUWGs9J2VMA0GCSqGSIb3DQEBCwUAA4IBgQBqQ6Zo7uPfd0cQ8Mg4
-RZPK+aUh5nnLjCGtirgXEPfOsABDTl6WaWaT3UowcFJVerJsEjxeG3j/OFZeN6RH
-944+GWYV0rh6Kd9tPxHMt0bCGm2y5X0GNegsz101FjkxQ0ptufCHjjT6nGuPBKmy
-xg9xbx0AIZfvY9+8ukQG9ICxc3yaWhfwPSvZiSRguQsn6WkNAQazuq/gZ51QV8fn
-r7jIA7P/4QTcc1oxITG107OrhPWVLF14pU5wX9x1mkQh1AZ/cuCxU3Plh11DPzsw
-72A3RJq/JfcFfiS+s0eZhvLj4bZRE72fAvJagmch05EDSxTR5dVkL4blJ+UBrkYL
-8wcAFySPmX2B9APEBpxG9bQBRdefcZ/LHt27sO/1u3gK662JBxAgeS8V72QWRPbu
-JK6qeJIQLyvDHXkt5u6UxFnJfW7JNiH6DmJw5oUDIMQWgfXvl+y8VVryU7R9txD2
-KW3i0DN94dcdT/QUFYLJBwV+9zTb9jK+yNWst2xyRDEAVcY=
-</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://nyas.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyas.demo.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jimmy</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jimmy</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jimmy</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto: jimmy.jakobsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml b/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
deleted file mode 100644
index 5df5c042..00000000
--- a/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://studeranuutv.its.umu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-09-19T12:49:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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://studeranuutv.its.umu.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Testsite för Bedömningshandboken för ITS, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Test site for Bedömningshandboken for ITS, Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Utveckling av Bedömningshandboken</mdui:Description>
-        <mdui:Description xml:lang="en">Development of Bedömningshandboken</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>its-studutv01.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=its-studutv01.ad.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAO5Cjru9EaeUMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMTF2l0cy1zdHVkdXR2MDEuYWQudW11LnNlMB4XDTE2MDgyNDA4NDA1NloXDTI2
-MDgyMjA4NDA1NlowIjEgMB4GA1UEAxMXaXRzLXN0dWR1dHYwMS5hZC51bXUuc2Uw
-ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCZK0gSWCW2v1SIshG5ZBjW
-uYtuj2iAqWd/QewIF2fS9grx0C+EAUB5ufurlGoSY4YcyKzxoq9L7CgDratVsdcm
-vBEkieESpGChxDpt5znZygE5QH6vV+32nofNEaatbJIR8zXOLYHva+UVIMfjQ7oj
-epgApdTDREk2wU4XcFhrK0OXu/XXDfNXkJkl10akS4em5/AQYeaCML5S7S06t0Ok
-dCQL1lSf3cDN4xTgpXtMMonmT3LLr21Q5jBe5n/AQIu8xv3IenVfX/cru6hoqB+d
-ctZMeBzYwRIxdcfIr+g6wFadggvCHRGF7YdfXXMMQXfjj5UV81m0xImCXClx9aME
-2nBXNT+WSmlGBMHzecb13r950bGwLYIyo9rgxlNJdsAmP4rW9zu2wCZA2kOvK0ZN
-z1GAR9pfUTv6rtp2T4lEZ2pxNzYw00PX7pRQWjdj13Uuh+c4Cy2fBdhCgS6SWZL/
-F6VXATCh2T1HEi2E5xWEpfi7sbJ3PDyOfFsmA6vZLqcCAwEAAaNFMEMwIgYDVR0R
-BBswGYIXaXRzLXN0dWR1dHYwMS5hZC51bXUuc2UwHQYDVR0OBBYEFF1RLZYx7wwE
-c+R7W7o5rHElUm/iMA0GCSqGSIb3DQEBCwUAA4IBgQAxF5fjqdfqeuM+5ZHFNq98
-qWzD6IzDhtGKMOTXd+SqSQ/RKFX8HZw5QHu6mnQ0rbyRX1DAjdU25IgbvtcnWT1A
-LLI1g4xAhXh9d/sMkXJtORU5VjjO+0QHYkyhsQ44h0ht7MIWbOArTaOqcWOiJWLC
-B4HrPxzoffpv9hblMj3fsbJL88QCWu7YfCEFLgxI/jJp1de7tVsaO4Q+Fk9AMSP5
-vAhz+7sXQOg4ywUAsygyyh7+xfkPenafrmjeNneMXez68bNRilUp3Jq1Aug+yYJG
-SDP/+ZWYz2mwuFAkxhuJKHjQZLlg/Abc3ZXNq9tw7JaOKDmvYxOb6zI1jIJs5diO
-CWYCnGEwb3vfKqREk3UlTGWxgyN2ndVkXvIP/3InqlG0xrA0wIyjiMkFNj+dGY2v
-OetizLpLG5SL/++9ALGrAQGtzKFtAAl6fa486zX6PsfpJ+2yQj9v83unnjzOYfXP
-A1TJgm8iwv1lbM4AwMqlLlWC+wOm7YV2zUrEYYcoPp8=
-</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://studeranuutv.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Erik</md:GivenName>
-    <md:SurName>Jonsson</md:SurName>
-    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 6aaec543..0dc78df2 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -299,7 +299,6 @@
   <xi:include href="swamid-2.0/test.play.hv.se.xml"/>
   <xi:include href="swamid-2.0/play.hv.se.xml"/>
   <xi:include href="swamid-2.0/moodlealfa.omv.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.hb.se.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml.xml"/>
@@ -315,7 +314,6 @@
   <xi:include href="swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/video.nordu.net.xml"/>
   <xi:include href="swamid-2.0/test.account.hj.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/dbhprod.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.test.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/expert.test.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml"/>
@@ -557,8 +555,6 @@
   <xi:include href="swamid-2.0/bookings.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml"/>
   <xi:include href="swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml"/>
-  <xi:include href="swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/jenkins.led.ladok.se-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/fidustest.skolverket.se-shibboleth.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index b80a5f0b..dea327b3 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -23,7 +23,6 @@
   <xi:include href="swamid-2.0/t0253.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/emmautv.ldc.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devrb.lbic.lu.se.xml"/>
-  <xi:include href="swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml"/>
   <xi:include href="swamid-2.0/stipendier-test.its.uu.se-stipendium.xml"/>
   <xi:include href="swamid-2.0/38caledon.ddns.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml-kph-test.xml"/>