Resolved SWAMID-2193

12 files changed, 63 insertions, 564 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 1e993363..82fb8ef3 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -9,7 +9,6 @@ accountcheckout.lnu.se.xml
 activate-test.du.se-shibboleth.xml
 akka-anv.uu.se-shibboleth.xml
 aktivera-test.su.se-shibboleth.sso.xml
-aktivera.ki.se-shibboleth.xml
 aktivera.su.se-shibboleth.sso.xml
 aktivering.db.umu.se-shibboleth.xml
 bedomningshandboken.uhr.se-shibboleth.xml
@@ -71,9 +70,6 @@ idp.test.antagning.se-aws-idp.xml
 its-pd0328.ad.umu.se-shibboleth.xml
 its-pd0030.ad.umu.se-shibboleth.xml
 its-pd0062.ad.umu.se-shibboleth-sp.xml
-kilw.ki.se-shibboleth.xml
-kilwdev.it.ki.se-shibboleth.xml
-kilwtest.it.ki.se-shibboleth.xml
 kisetest2.user.ki.se-shibboleth.xml
 kitstidp01.tst.ki.se-idp-shibboleth.xml
 kurser.math.su.se-shibboleth.xml
@@ -86,9 +82,6 @@ login-dev.du.se-idp-shibboleth.xml
 login.du.se-idp-shibboleth.xml
 login.idp.hhs.se-idp-shibboleth.xml
 login2.temp1235.hhs.se-idp-shibboleth.xml
-lpw.ki.se-shibboleth.xml
-lpwdev.it.ki.se-shibboleth.xml
-lpwtest.it.ki.se-shibboleth.xml
 mailfilter-test.nordu.net-shibboleth.xml
 mailfilter.nordu.net-shibboleth.xml
 mailfilter.sunet.se-shibboleth.xml
@@ -150,8 +143,6 @@ tcs-test.sunet.se-shibboleth.xml
 test-chalmers.pingpong.net-shibboleth.xml
 test-ki.pingpong.net-shibboleth.xml
 test.mp.uu.se-shibboleth-sso.xml
-testakt.it.ki.se-shibboleth.xml
-testgag.it.ki.se-shibboleth.xml
 testshib.msacademicverify.com-shibboleth-sp.xml
 tta-portal.misc.kth.se-shibboleth.xml
 umdac-stdout.umdc.umu.se-shibboleth.xml
diff --git a/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml b/swamid-2.0/account.tst.ki.se-shibboleth.xml
index 913e8e5f..5f130482 100644
--- a/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml
+++ b/swamid-2.0/account.tst.ki.se-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kitstaccount01.tst.ki.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account.tst.ki.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -25,37 +25,74 @@
       </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: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://account.tst.ki.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Karolinska Institutet</mdui:Description>
-        <mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">KI Account (test)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KI Account (test)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Kontohantering/aktivering för anställda, studenter, m.fl. som har konto på KI</mdui:Description>
+        <mdui:Description xml:lang="en">Account management/activation for employees, students and others with accounts at KI</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kitstaccount01</ds:KeyName>
+        <ds:KeyName>kitstaccount02</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=kitstaccount01</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAMotUlCm5wEsMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmtpdHN0YWNjb3VudDAxMB4XDTE1MDYxNzE0NDExM1oXDTI1MDYxNDE0NDEx
-M1owGTEXMBUGA1UEAxMOa2l0c3RhY2NvdW50MDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDULV+rqqGOAkO4OzuLHAie9mAXpDM3uMceCDsyJuHBBv3M
-LwN/kFR4hFOMuDl5ZlDMgKyoldfJgrzr9wNxX+yQowzG/I3sOfdKHHWuMYsDnfkQ
-w/BM7FMSPydi//iWRJp18Miv8qJGMMDyX4bBlVPvwsvA4hg9w/Lz7IztpZnF4T9l
-oqEpc+9/wCOZw4YWiye078cg1jz7qgTYNiTNcYrq5IrcjXGHaqgBw1eXWeXNthFh
-HD9uTlpJ8oatCZWxo5iwgbyny0hOTTJw3qWcA6XhpDfP4aZQ9xu+AMz7hsaGxHs/
-3aJXLU2eHPzn24PYUXb+B8GUjvwBS65hsFdiylbzAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmtpdHN0YWNjb3VudDAxMB0GA1UdDgQWBBQ5Kcc5QnyPLh/4Klhj7sXcuDvw
-OzANBgkqhkiG9w0BAQUFAAOCAQEAf3vDJ+yv6U6zRagOgoFGs0B6uuffoVbiZw0H
-+Vey5DJw6/hbVPZAKPf8FP/Ug/6V693IYCHOFGqSbJyroaggEJoih+eFdFwj1Kcg
-qv0u+jn59/5lwXMZAKEX3lVLZFpN4wqj5LoLPG9eEa+zCBZ0a6Uv32II8LaxWLim
-RPykkeSsNbO1KM0NFZc3S4PXyXAgC4peUykyHZiCekyJO1/3f82kZLUcoGQ3R6Gx
-sxAP68C4FVn1JXlyWwwF0JAhLUWkHo4bzMp8vXTI6C8Vn8TmSgcPTVZKcVUyljj7
-8yH9mWWt0u8sBHe2xo+WAhVOa9SUyyLGHeH+BNjPuT8fZO6p/w==
+          <ds:X509SubjectName>CN=kitstaccount02</ds:X509SubjectName>
+          <ds:X509Certificate>MIID8TCCAlmgAwIBAgIJAJ0SjQN6wIZYMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+BAMTDmtpdHN0YWNjb3VudDAyMB4XDTE4MDkyNzEyNTIxN1oXDTI4MDkyNDEyNTIx
+N1owGTEXMBUGA1UEAxMOa2l0c3RhY2NvdW50MDIwggGiMA0GCSqGSIb3DQEBAQUA
+A4IBjwAwggGKAoIBgQCcfM1KYqRlCTWqwGcem8xaW29vyr85d5oTHjncMk4qZgAk
+llZZfpx6ZgimC0CfBXl135eixHtoYNDNxrU5ymRqSlWPAVUVRmZbYrwaD5W/MI66
+SjJCeahNJu9HnEFkmhoOb+30MU3FmyHhhJ3H4MgUKNX0sJvYUUkXqMCwsgv567cN
+8VH4mA1cXUS3+tuVN+Frm9SXIoLkerQ8UlfXa0Hmw1j3V86j/NXGEvh2NmMVl0dL
+7KX1rbd74j1puzcq7uRUpppvy0DbC9TZNRC4jid1percYwzsjcJACSlub6dxqeme
+mNh3psGddav0CTY9pdLOGJIDKEghYoults8sMo3+hTs83Mg4A7vmxTx7H1yhL1jN
+zHcuefmkMC65oc+ZNq9yw9jIJgz+vJygAautj4v1aha0wBpp+9Whf447uVGE+f+5
+yJEn8wOxArGl05xFpYCiVZpZDiYK2ruaTIw4oCJd40u8uEcTahEIoC+J26LFC/Sl
+MqS9s9syb8JHLcW2zL0CAwEAAaM8MDowGQYDVR0RBBIwEIIOa2l0c3RhY2NvdW50
+MDIwHQYDVR0OBBYEFDJCqeH7IJpZUArfCvfRLNpzXZeaMA0GCSqGSIb3DQEBCwUA
+A4IBgQAtdWnvfBQYhRMYj16vUyu2xAqcQ9FM5Gez4B/PN+qg+Nz64RBdcae5d2c+
+aadpPYA6acvEopG8q4qn5AG85eOYqyfSNJtVpmQ4WfI7PPpj3Co44XErI8uKCVWH
+9rjmEUhMcBZ2Fa5I/tuoMSwx/qZ1G5rTHqCNe5/E4CRVfrUwV7Frq78jA2MXeLsm
+xA/RR0AwAs7FcqD9cFSaC9zUpWA+RJj8mjkInkrrMRLN/xeBEQ2nOdPKABvApXs8
+vYzlwHuTfLpdsvqOXKIEDUG3KehgFIzAjtJjSG7/kEpoFij180PtFMnXhWCR2Gyp
+ttbi4fP8kTUFoNecbfbyVqW+gkTv0hb0uq3ZhjXcJlqxviMrIeBzSczutAFlwhPg
+9kK8rsZ2TnYgxwIyh/ZH9krgP7CExuRQ7LSsvT9/jHA0xIwZtx2Sq0M7kkYnEws4
+pmOkF0I1lUtUOqbm/le2XL6qO1AJ7kIxn4yF+7naPCtrP86Ysv0HB4bbhFhvAerA
+WPYTbJ4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kitstaccount02</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kitstaccount02</ds:X509SubjectName>
+          <ds:X509Certificate>MIID8TCCAlmgAwIBAgIJAJddqaaAnjFpMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+BAMTDmtpdHN0YWNjb3VudDAyMB4XDTE4MDkyNzEyNTIxN1oXDTI4MDkyNDEyNTIx
+N1owGTEXMBUGA1UEAxMOa2l0c3RhY2NvdW50MDIwggGiMA0GCSqGSIb3DQEBAQUA
+A4IBjwAwggGKAoIBgQDrJXjS5W4NOGb1texcFHePcOTHb4figMMti44+QtRZJAqa
+v2ce86Fd72ZWW6h8Kok/hakkJpCOEYfPFDLVcRpUsuVTxrZqmKZo0K6bAcV1wU62
+3IAICXGxL4JLJt7b9xE5jpzL02cmTe6ahZT+2iU1LBcIvCi/wDmaqbUYFtoC4zcj
+XSig0hR7I6BA/pjV+NRmggxpFAt3IkeSZtbyuPBnCRhDD5FoNNK2Qb8eb93iaQIZ
+lsd4bmDoJD2WbndGchkEmRTLju8ir2GLNpduJp5KMscKK4Z+EhyD69IK+0AJGYUR
+kHFODSbEQ98JrYUCYKDfMVXtlwNQQNuR+UkEEEHZ81RUpGrbo5N6mBSKNS61HA/0
+A5ObLrxtpwbcl0ANF10ImoyPKHe3/8J5+dlrRnarxRb0oPh4mtN479DwsvTo+FTJ
+k+KiRTvUaZx6HSlgsshCP5FjGWhxK1WTTi6B8dF9BnhSKDyHBLMqXwmGvX6r4Ofe
+5PQNEK7RGncxQzy9DWsCAwEAAaM8MDowGQYDVR0RBBIwEIIOa2l0c3RhY2NvdW50
+MDIwHQYDVR0OBBYEFCj0cPgMkGwdXVg/53a7e7ekjGv/MA0GCSqGSIb3DQEBCwUA
+A4IBgQCPwfVpCrucR8oKRO3MtLOv9eAg5MuMES9MHKOZcXuFp4pLCRf3344N+jik
+zL9R+c/FsIcbdEOwe4GT8Q4t2wzW3n8X5j3oTIfqZtSxpm32O1/7TTS8bltRPBEa
+5RELYyx+Umbv6Vuk6SgORu4PQqhCbCNCxbYhOWVmdC2khAVyAduGnHTtuv+ZuXuP
+q+f8j88zpAh8GSCJHH7+4WyDQV0Kj68BKOyP3W+zPK4FTPd5oENo1QiSo+AIiXwm
+BhbH3AKgNRZoXUjg+7yciEDzksO7f5h+lmSfMhiOgkUZ4B63OAXIF25g7FTic12O
+S94QjNh8PBmhpdK5IdKWxiaOFkCERwj+XXE+Np9Hk/ysdrsNxXjXFysl3jVEvHON
+nI9Ix5nMnL/N/Tt9aDuYtAywFX9kPlS4u3LGRhjqaljXz5/dMOq98FpHZqoL2Xrn
+HfEtdyWoym5tQj7qZhcgcrOVZoMO+28u3cdTVFVKGNHxRzM56vgGvJL1jIQe18D+
++8NqzrQ=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -77,7 +114,5 @@ sxAP68C4FVn1JXlyWwwF0JAhLUWkHo4bzMp8vXTI6C8Vn8TmSgcPTVZKcVUyljj7
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.tst.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.tst.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml
deleted file mode 100644
index 99b28e38..00000000
--- a/swamid-2.0/aktivera.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aktivera.ki.se/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://aktivera.ki.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://aktivera.ki.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Karolinska Institutet</mdui:Description>
-        <mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aktivera.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aktivera.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJALyq1Aqsb9IBMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmFrdGl2ZXJhLmtpLnNlMB4XDTEzMDMwMTEyNDIzM1oXDTIzMDIyNzEyNDIz
-M1owGTEXMBUGA1UEAxMOYWt0aXZlcmEua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCl1rok6UwvfFyFpN/akmpBOTAy6JJnWpMjIQPOcW/cJDQa
-fAri1mWsarSzgKM/C4MdL2T3IjQyhLvydm++hQvGEIn2OPLrWPr9j9KFCZ6Vysnh
-GTa3j29SReSKjJkMVMD4t9nAJsDkx8NQyimSV7hgxhhvoVIMchJ0WusWqxxpeLyt
-LfNt5UModNQMmrF66Nr+DCCBOYsYOUDhjHz3EYWs2jEx1LfnZomcn365bDEG9Z3t
-qg+kcXTvnHwhO9CAE4oFzn4OWy1ucFyffGair12FkQUhHSLkgcMnhsa9qa+9yViM
-X7zII9pVE6BeebBscN3BeDjYphEuo5Z6UamQ/yhdAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmFrdGl2ZXJhLmtpLnNlMB0GA1UdDgQWBBTTRtopMmSDYlR/zxoMdZDFeO+X
-+zANBgkqhkiG9w0BAQUFAAOCAQEAmszPge3RJcRexpZwaD70KOr4MMKn7+ke6y+J
-ym/fHpNH3FSHSTCNGzcl+80uXYtXnlcFTZ7gyDmoqhtcrxjwc4elOGlPfOXbUlri
-XsIGra4z/g/5ZeIFHczDVBek1obXVrYDGj6GYtzF6Mkkghy6iJvhTzPQfvJwxgfT
-QHLT0e/V9KmT2E1eHx7QpfBh5Uab714COk5zoP5PWFnwvBfpSb0sTlJcOGP9nz2E
-HxR7p2CxcGozA68nst9lx34XSYT1VTXRED7m+H+nGN8lJNjDcAZsudpBsmOU7Pbs
-t1UEJRh1QFCjTJZ0dWFqE9ZDz8jPeZGuERdOnxv9ooMtwU9t1w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivera.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kilw.ki.se-shibboleth.xml b/swamid-2.0/kilw.ki.se-shibboleth.xml
deleted file mode 100644
index d976f71a..00000000
--- a/swamid-2.0/kilw.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kilw.ki.se/shibboleth">
-  <md:Extensions>
-    <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://kilw.ki.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://kilw.ki.se/Shibboleth.sso/Login" index="1"/>
-      <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://kilw.ki.se/Shibboleth.sso/Login" index="2"/>
-      <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://kilw.ki.se/Shibboleth.sso/Login" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet LW-proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Proxy mot Ladoks uppföljningstjänster</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kiladok01.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kiladok01.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJALIjJ4W5G5NlMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2tpbGFkb2swMS5raS5zZTAeFw0xMTA2MDkwOTE3MzJaFw0yMTA2MDYwOTE3
-MzJaMBoxGDAWBgNVBAMTD2tpbGFkb2swMS5raS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKaPBu20JzB9Ko3IQNSei/zbfY2N75RUATikwdmju6Uy
-lIFdSbQCsEl6o1mktZysNrUL2tj6l45kDZmaCxvKakuC5bIHQY9E8kWHdrXHTxEx
-QCDw6+NSHcRzJwKpUQZKVz7YdTNl+7qnoqpQpVYTB7aPMXn71xDHIspRg6RtJvly
-FH1ADlRyVuiUd/CKvp4b6UBOMmnHgbdKSaY0N362Ks0wmw13ZMc4O9QChgx4R33R
-4ooNV79byMtJ8RPomTNMTlVAnsSMFjXh3yNzxra7zGQnUAlzXyY5+rH1kaRqstfr
-XyxVg9nlvv82gsczPxXl0kexWh+DW3wB9LtflKkCyA0CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPa2lsYWRvazAxLmtpLnNlMB0GA1UdDgQWBBRzCPPEABQ2vMTzaw86FhJS
-/qGq9DANBgkqhkiG9w0BAQUFAAOCAQEAgcz87bN6b0aAbEceZR+bmbAHDrcU5bA2
-Z7LQt+PWQDeXS3WCf7xwGxHSUEer9gP078Zo1Z72UMnowQW4Fuwrp/lAOVhsAGPZ
-g10njIwKk9oi69hIgjoU+YD03Zt2zglrkOFoSH4Gy2QbmIiF3ihSjiY/eYtrDQhr
-yPAkIV8gl8A16so6D364fbNuF9ay5ONY3J+P20Scmuhuel55KdEnR1SIxdQ0Fml0
-XBbBB8yIgXxH5y12cJA0350DeuLjV2lI+Vwo+cHc4l4Iy60nCmU/AhOPsrn/KSol
-D1QNfeY/pFOqpfSxgp64TIVe9v9UJ7QJRm7zh51LDEjqyJwd/xxNyA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilw.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilw.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kilw.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilw.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilw.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilw.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kilw.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilw.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kilw.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kilw.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kilw.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kilwdev.it.ki.se-shibboleth.xml b/swamid-2.0/kilwdev.it.ki.se-shibboleth.xml
deleted file mode 100644
index 69df0b77..00000000
--- a/swamid-2.0/kilwdev.it.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kilwdev.it.ki.se/shibboleth">
-  <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://kilwdev.it.ki.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://kilwdev.it.ki.se/Shibboleth.sso/Login" index="1"/>
-      <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://kilwdev.it.ki.se/Shibboleth.sso/Login" index="2"/>
-      <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://kilwdev.it.ki.se/Shibboleth.sso/Login" index="3"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kiladokdev.it.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kiladokdev.it.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAMp62nwgYW3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2tpbGFkb2tkZXYuaXQua2kuc2UwHhcNMTEwNTA2MDk0MzI0WhcNMjEwNTAz
-MDk0MzI0WjAeMRwwGgYDVQQDExNraWxhZG9rZGV2Lml0LmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxM8SLReq15M/D/J0ETBYZvMTVMpeno0B
-5d/ax2AOsJPn/4rzzVTTtIMroxr8yXKZ0RIxg+WsBqsNzhTEvzHa850rs0fZ9vkn
-mYWzBR13XFI0e6bS3jmqw5qFLQP6AsQ4Nfnw+BJILpRZSAVa9dTdfuAMGWT5t3VO
-6BgSvoxFgnvewR1yHuwZwnyHd3wqQIXlL7AibGSf+yoeCmatDueEn563ScU/62E6
-EBFcQFPC0vLC8w6XVwD4wVKyZXeTGG5fR4TUPeg6DaNc+jod59A9x6L0SZSMRqpe
-oaAy2xTIY1aVYi6KAnDI2Zo+Aqazi9S8v+V7Euzhkq81M4s8fZDvgwIDAQABo0Ew
-PzAeBgNVHREEFzAVghNraWxhZG9rZGV2Lml0LmtpLnNlMB0GA1UdDgQWBBTNYLed
-xgm2UWlp89Kv854gx1F84TANBgkqhkiG9w0BAQUFAAOCAQEAqnJVmyJnj6/6C5uC
-2K7FhlIyNm4sgzh+OzirRbGg+5P/hCUzv9AbjVyichts8L1BGdRrDTd6alWAe8jo
-molQUIizH5+reZIql9bjGCOkbrhTVLmzx8Tv4jCa202nXdrAazzBpbYf8JYGGSep
-D68STfoiiCfJrq2tiHPLhyaRthmHIP+kpG3QLNnWfg5T6f+gfDy6/EKnFDAD+oSq
-T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
-1ykeP8ZFUW1tLe1vSfWMX7xVAPRLKPHDVHcANNvpncnz+Qb/RyXRAyEXnpNNurRQ
-9c/C1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwdev.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kilwtest.it.ki.se-shibboleth.xml b/swamid-2.0/kilwtest.it.ki.se-shibboleth.xml
deleted file mode 100644
index cfa28bdd..00000000
--- a/swamid-2.0/kilwtest.it.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kilwtest.it.ki.se/shibboleth">
-  <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://kilwtest.it.ki.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://kilwtest.it.ki.se/Shibboleth.sso/Login" index="1"/>
-      <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://kilwtest.it.ki.se/Shibboleth.sso/Login" index="2"/>
-      <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://kilwtest.it.ki.se/Shibboleth.sso/Login" index="3"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kiladoktest01.it.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kiladoktest01.it.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAMJ9LjHSUsvoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmtpbGFkb2t0ZXN0MDEuaXQua2kuc2UwHhcNMTEwNTI2MTMyNTMzWhcNMjEw
-NTIzMTMyNTMzWjAhMR8wHQYDVQQDExZraWxhZG9rdGVzdDAxLml0LmtpLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOUmjHK3EDwdhiUDbm9oW/u8
-n/ksrSapvbz+TTMQ70a01QHdcU1d48Dq2rjOVUpiZvV+SVjrSsSaqoTW6X0jUwgO
-nzQZayVMGia9x5Y0zphksK0RIXrcZhN34zamHyg+ioVqumZWVfaXbfkDUphfJ25E
-+HzioYe9pzr+dWeS0bTMQ6kcgI+KZqVfpKYeNn/6c5zgfYFUy8lp7pYr5yRr7HKM
-xbezT7PTdMIXwqI291G4VaTed/jDFOtYInMI3nGcg1U75TjMxbJIjDl24hWMxb3t
-WP1vAQvQDhTYuAPaQZq/FPCYWBbbKmHUG2RcquSWYullHwvWgRnzXi04/8luwQID
-AQABo0QwQjAhBgNVHREEGjAYghZraWxhZG9rdGVzdDAxLml0LmtpLnNlMB0GA1Ud
-DgQWBBTm4IeB4clBD5Xy65Su9mR25oz94DANBgkqhkiG9w0BAQUFAAOCAQEApjAT
-ZMzYK0b21AfhOC4ELmXzRIG7tjEqpG1S2KGjTML3OPQ3iqY0+6NH5ihcG7L5U+Ot
-S3HswID9RV4fRkvB2HJ1cBDSH8DbCCi6LyYydJPfJloYJ/AdrumlJQDVJRNyYD6T
-53on7zeJaKv3n9eJrhqdnoEy0ofJtTAydbEx+F3AT3tW+jjpo5biuyuOa6W0wv0J
-DICtfX5UbSz96NxJbSCjoD23hMXqMOcUT3Pllk1MuPeK18rxZWy8qwxVk+E/haLr
-OaQPhM+ucEz0I/gHI37mAyzAz8w9PSTjwN+GKKngB+8IcdOQcUVRIhhTtu+ukBjR
-e01/KT+BtiGpAdoAUA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwtest.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lpw.ki.se-shibboleth.xml b/swamid-2.0/lpw.ki.se-shibboleth.xml
deleted file mode 100644
index 4e9762b9..00000000
--- a/swamid-2.0/lpw.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpw.ki.se/shibboleth">
-  <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://lpw.ki.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://lpw.ki.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">LPW - Karolinska Institutet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">LPW - Karolinska Institutet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok på webb för studenter på Karolinska Institutet</mdui:Description>
-        <mdui:Description xml:lang="en">Ladok on the web for students at Karolinska Institutet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kiladok01.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kiladok01.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJALIjJ4W5G5NlMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2tpbGFkb2swMS5raS5zZTAeFw0xMTA2MDkwOTE3MzJaFw0yMTA2MDYwOTE3
-MzJaMBoxGDAWBgNVBAMTD2tpbGFkb2swMS5raS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKaPBu20JzB9Ko3IQNSei/zbfY2N75RUATikwdmju6Uy
-lIFdSbQCsEl6o1mktZysNrUL2tj6l45kDZmaCxvKakuC5bIHQY9E8kWHdrXHTxEx
-QCDw6+NSHcRzJwKpUQZKVz7YdTNl+7qnoqpQpVYTB7aPMXn71xDHIspRg6RtJvly
-FH1ADlRyVuiUd/CKvp4b6UBOMmnHgbdKSaY0N362Ks0wmw13ZMc4O9QChgx4R33R
-4ooNV79byMtJ8RPomTNMTlVAnsSMFjXh3yNzxra7zGQnUAlzXyY5+rH1kaRqstfr
-XyxVg9nlvv82gsczPxXl0kexWh+DW3wB9LtflKkCyA0CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPa2lsYWRvazAxLmtpLnNlMB0GA1UdDgQWBBRzCPPEABQ2vMTzaw86FhJS
-/qGq9DANBgkqhkiG9w0BAQUFAAOCAQEAgcz87bN6b0aAbEceZR+bmbAHDrcU5bA2
-Z7LQt+PWQDeXS3WCf7xwGxHSUEer9gP078Zo1Z72UMnowQW4Fuwrp/lAOVhsAGPZ
-g10njIwKk9oi69hIgjoU+YD03Zt2zglrkOFoSH4Gy2QbmIiF3ihSjiY/eYtrDQhr
-yPAkIV8gl8A16so6D364fbNuF9ay5ONY3J+P20Scmuhuel55KdEnR1SIxdQ0Fml0
-XBbBB8yIgXxH5y12cJA0350DeuLjV2lI+Vwo+cHc4l4Iy60nCmU/AhOPsrn/KSol
-D1QNfeY/pFOqpfSxgp64TIVe9v9UJ7QJRm7zh51LDEjqyJwd/xxNyA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpw.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpw.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lpw.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpw.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpw.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpw.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpw.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lpwdev.it.ki.se-shibboleth.xml b/swamid-2.0/lpwdev.it.ki.se-shibboleth.xml
deleted file mode 100644
index 4397ce9e..00000000
--- a/swamid-2.0/lpwdev.it.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpwdev.it.ki.se/shibboleth">
-  <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://lpwdev.it.ki.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://lpwdev.it.ki.se/Shibboleth.sso/Login" index="1"/>
-      <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://lpwdev.it.ki.se/Shibboleth.sso/Login" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kiladokdev.it.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kiladokdev.it.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAMp62nwgYW3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2tpbGFkb2tkZXYuaXQua2kuc2UwHhcNMTEwNTA2MDk0MzI0WhcNMjEwNTAz
-MDk0MzI0WjAeMRwwGgYDVQQDExNraWxhZG9rZGV2Lml0LmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxM8SLReq15M/D/J0ETBYZvMTVMpeno0B
-5d/ax2AOsJPn/4rzzVTTtIMroxr8yXKZ0RIxg+WsBqsNzhTEvzHa850rs0fZ9vkn
-mYWzBR13XFI0e6bS3jmqw5qFLQP6AsQ4Nfnw+BJILpRZSAVa9dTdfuAMGWT5t3VO
-6BgSvoxFgnvewR1yHuwZwnyHd3wqQIXlL7AibGSf+yoeCmatDueEn563ScU/62E6
-EBFcQFPC0vLC8w6XVwD4wVKyZXeTGG5fR4TUPeg6DaNc+jod59A9x6L0SZSMRqpe
-oaAy2xTIY1aVYi6KAnDI2Zo+Aqazi9S8v+V7Euzhkq81M4s8fZDvgwIDAQABo0Ew
-PzAeBgNVHREEFzAVghNraWxhZG9rZGV2Lml0LmtpLnNlMB0GA1UdDgQWBBTNYLed
-xgm2UWlp89Kv854gx1F84TANBgkqhkiG9w0BAQUFAAOCAQEAqnJVmyJnj6/6C5uC
-2K7FhlIyNm4sgzh+OzirRbGg+5P/hCUzv9AbjVyichts8L1BGdRrDTd6alWAe8jo
-molQUIizH5+reZIql9bjGCOkbrhTVLmzx8Tv4jCa202nXdrAazzBpbYf8JYGGSep
-D68STfoiiCfJrq2tiHPLhyaRthmHIP+kpG3QLNnWfg5T6f+gfDy6/EKnFDAD+oSq
-T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
-1ykeP8ZFUW1tLe1vSfWMX7xVAPRLKPHDVHcANNvpncnz+Qb/RyXRAyEXnpNNurRQ
-9c/C1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwdev.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lpwtest.it.ki.se-shibboleth.xml b/swamid-2.0/lpwtest.it.ki.se-shibboleth.xml
deleted file mode 100644
index 3f32eef6..00000000
--- a/swamid-2.0/lpwtest.it.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpwtest.it.ki.se/shibboleth">
-  <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://lpwtest.it.ki.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://lpwtest.it.ki.se/Shibboleth.sso/Login" index="1"/>
-      <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://lpwtest.it.ki.se/Shibboleth.sso/Login" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kiladoktest01.it.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kiladoktest01.it.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAMJ9LjHSUsvoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmtpbGFkb2t0ZXN0MDEuaXQua2kuc2UwHhcNMTEwNTI2MTMyNTMzWhcNMjEw
-NTIzMTMyNTMzWjAhMR8wHQYDVQQDExZraWxhZG9rdGVzdDAxLml0LmtpLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOUmjHK3EDwdhiUDbm9oW/u8
-n/ksrSapvbz+TTMQ70a01QHdcU1d48Dq2rjOVUpiZvV+SVjrSsSaqoTW6X0jUwgO
-nzQZayVMGia9x5Y0zphksK0RIXrcZhN34zamHyg+ioVqumZWVfaXbfkDUphfJ25E
-+HzioYe9pzr+dWeS0bTMQ6kcgI+KZqVfpKYeNn/6c5zgfYFUy8lp7pYr5yRr7HKM
-xbezT7PTdMIXwqI291G4VaTed/jDFOtYInMI3nGcg1U75TjMxbJIjDl24hWMxb3t
-WP1vAQvQDhTYuAPaQZq/FPCYWBbbKmHUG2RcquSWYullHwvWgRnzXi04/8luwQID
-AQABo0QwQjAhBgNVHREEGjAYghZraWxhZG9rdGVzdDAxLml0LmtpLnNlMB0GA1Ud
-DgQWBBTm4IeB4clBD5Xy65Su9mR25oz94DANBgkqhkiG9w0BAQUFAAOCAQEApjAT
-ZMzYK0b21AfhOC4ELmXzRIG7tjEqpG1S2KGjTML3OPQ3iqY0+6NH5ihcG7L5U+Ot
-S3HswID9RV4fRkvB2HJ1cBDSH8DbCCi6LyYydJPfJloYJ/AdrumlJQDVJRNyYD6T
-53on7zeJaKv3n9eJrhqdnoEy0ofJtTAydbEx+F3AT3tW+jjpo5biuyuOa6W0wv0J
-DICtfX5UbSz96NxJbSCjoD23hMXqMOcUT3Pllk1MuPeK18rxZWy8qwxVk+E/haLr
-OaQPhM+ucEz0I/gHI37mAyzAz8w9PSTjwN+GKKngB+8IcdOQcUVRIhhTtu+ukBjR
-e01/KT+BtiGpAdoAUA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwtest.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/testakt.it.ki.se-shibboleth.xml b/swamid-2.0/testakt.it.ki.se-shibboleth.xml
deleted file mode 100644
index aa7239ed..00000000
--- a/swamid-2.0/testakt.it.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testakt.it.ki.se/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://testakt.it.ki.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://testakt.it.ki.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test för Kontoaktiveringstjänst på Karolinska Institutet</mdui:Description>
-        <mdui:Description xml:lang="en">Test for Account activation service at Karolinska Institutet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>testakt.it.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=testakt.it.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAM3DTvphmyUaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHRlc3Rha3QuaXQua2kuc2UwHhcNMTMwMTE0MTMxMzAyWhcNMjMwMTEyMTMx
-MzAyWjAbMRkwFwYDVQQDExB0ZXN0YWt0Lml0LmtpLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAy4YOjmQB9kSZvz0c1Z6XH4AgfrKrTrx/Wnd8Nid3
-h1Mqpa07HvZtL7dZKsyhspvbx/AJpbLCzr3yCXVWgohUe+MJWn2/hCfymggN+yrV
-US9fuMGTErSCQ9VZ7BmmvEPclhWMBvA8r2Po5Nzcz+exVI09Ww9rKO0oNyaxxwPv
-ig2thOgQgd7/GNZweyevb1YDIxLmpTxI2OwK3E4ikx8InVSqEqTNu9q6se6bjHeo
-BmTQORnTeyz542hRu0cjOV5AcuvMreMXG4N+qW/cToFdjc3JutqKfi3irBJGF0pc
-fBpTbb2/MhAtDviCAwCJzqazHnqYRgjhStDMFAe9Ip97zQIDAQABoz4wPDAbBgNV
-HREEFDASghB0ZXN0YWt0Lml0LmtpLnNlMB0GA1UdDgQWBBQNLiq+j2EVv4KpAbSO
-Yb8ANJv3pTANBgkqhkiG9w0BAQUFAAOCAQEAaW8+I6eqKO0mpQ1OHvLjOngaFdzy
-QYi/vkE5eenu10aG7pz0QprIv+9QarNgNEkG9fWS7FzjqzMksTqg+C0ZxXwk8QP5
-XOTTrfOIYw9yfn/AxodLSImxibvC8vt2mFF4xLe9FC42Ur8Fb5TiIBTviE81nCLP
-hYX1kyL7fAUVecAwkn33Bwb0QCO6i0rq3XLSB+hS0qJb5qePPJLc+jfmSdjLlPtx
-agf3dT6iLUDOMQhLG3qA2QZqhjEbpzvcGXUjF4Z2nf+OtplAI2nTcDz8x45nIwnY
-MUoo/uwKQn4shjggip2k4jZ7JH/EBCXLYrptWqr7YPmos4JHpYwZwAwhFg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testakt.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testakt.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testakt.it.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/testgag.it.ki.se-shibboleth.xml b/swamid-2.0/testgag.it.ki.se-shibboleth.xml
deleted file mode 100644
index fdba6a7f..00000000
--- a/swamid-2.0/testgag.it.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testgag.it.ki.se/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testgag.it.ki.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://testgag.it.ki.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>testgag</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=testgag</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAI3dJm1l0MPyMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-BAMTB3Rlc3RnYWcwHhcNMTMwMTExMTI1MDE5WhcNMjMwMTA5MTI1MDE5WjASMRAw
-DgYDVQQDEwd0ZXN0Z2FnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-saStaMXWwBLjgdSvc9snMbM9KfhmNoWPVNRAYO1gUmBrX5p1XK6JFxkqIRpwEZ/t
-hqowU//tIOXKjipMa7hkX9k+n/jP5Cy/4EVHkczW9iYf/qaCC4L/0DZOYXxXmJTH
-718wgG2QQwbXNBgEPldCVqs3Vr74F0uryI222Qk8Iyei4psi9P5Eng68N3+kB5T2
-F+MnwjyCU9MXOD0s76genwJ+Kat8uZWLb/uX/Xw3UMr/QHdRlBrD8kuXR037mfIf
-e3aE0oBYKgWYUbUFsPjWdWOPs4GhtgN7Xz/UBXVOKDm7ovQpmSYB4BSFj2da3Wqw
-chIq046RECnOJr94HaU9+QIDAQABozUwMzASBgNVHREECzAJggd0ZXN0Z2FnMB0G
-A1UdDgQWBBQ1FMmD2kBlT1fLG1WiGNTqKXN+tTANBgkqhkiG9w0BAQUFAAOCAQEA
-mj0wtGNPs+RQnVB8wX40A9eHeE5VhjjTME787giTg6jeQNN5LYySlY35sNBPzRaw
-W53kUdaH2ZSRyr74W9ZZci9o1bNIzvxZUEn4hLsa6HQoGLxRopGXJvNC5+hEli/9
-aYN28/iDO1t+nO7krxcPH61sBAEnKq9OJM9oQrWol3lGEkeWhq6Evcdd0Fx5l2E7
-zo0PZj6BRUxSCIa8c1pJLtQhimhPb5CuamnOir5Ae6FrxSmqdbA9CBT9MXioBcUC
-QXyxky4ZRxRwrSEEgAnSMnEVxO6Q0kbyQImZXy7fTe3PninA9t0jy/p7b6qNqsMH
-JDXzgzqNBDH+pyHcbSmlcA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgag.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgag.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testgag.it.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0fb163e8..89e3d244 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -35,16 +35,12 @@
   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml"/>
   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sfs-sp.xml"/>
   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml"/>
-  <xi:include href="swamid-2.0/aktivera.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/problem.math.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/kilw.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/selfservice.hb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/expert.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/www.universityadmissions.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/kilwtest.it.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/lpwtest.it.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml"/>
@@ -137,7 +133,6 @@
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/lpw.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
@@ -171,12 +166,8 @@
   <xi:include href="swamid-2.0/play.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-stable.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/testakt.it.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/testgag.it.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/download.portal.chalmers.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portalservicesutv.miun.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/lpwdev.it.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/kilwdev.it.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-ki.pingpong.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
@@ -327,7 +318,6 @@
   <xi:include href="swamid-2.0/account.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ubas.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/emrex.its.umu.se-gui-sp.xml"/>
@@ -633,4 +623,5 @@
   <xi:include href="swamid-2.0/uu-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/uppsala.instructure.com-saml2.xml"/>
+  <xi:include href="swamid-2.0/account.tst.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>