pulled metadata from old workshop that failed discoveryresponse validation

author: Leif Johansson <leifj@sunet.se> 2012-05-10 09:26:57 +0200
committer: Leif Johansson <leifj@sunet.se> 2012-05-10 09:26:57 +0200
commit: 848167c77893048e14305c935d13cd5ac42aaf16 (patch)
tree: afba72d7a565659f282f9279ce9bcd66d1d66a30
parent: 52e7964e02daefe0813441abb0f782e4128d7930 (diff)
25 files changed, 0 insertions, 1051 deletions
diff --git a/nya-workshop/130-229-17-13-dhcp.ap-wlan.ki.se.xml b/nya-workshop/130-229-17-13-dhcp.ap-wlan.ki.se.xml
deleted file mode 100644
index 4e6e76db..00000000
--- a/nya-workshop/130-229-17-13-dhcp.ap-wlan.ki.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-17-13-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-17-13-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-13-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAJIiPey1w1Y0MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIDEzMC0yMjktMTctMTMtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTExMzI1OFoXDTE5MDQxOTExMzI1OFowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0xMy1kaGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBUfcpI8oajZ2RJVjGNM3pUrmuvw/Hi6qRwAHjNnhGJ86BGbj4BIr98mekFa0S7diKmW/C9WzPGuk+tXz0FBXenETS2zJhhoKgdUwFqp66GUxF8SMr331UPV0be5wFtuFnAfQrX/2spYbTfXbsUiXkbSALqrybYoZKvhHj4MPtYV8nWjfiDlRQJdL8EhnYlHbVPIpwHrNt2r3ikDtIoAdtKE/1rvXJBwnQ4CBgjpXG/8HHWiXxQzlN0HKeIwUcuIXJlP+vAKE90VT8QUVQNeq/GnqS6ddTJ8TR8jMuL3c2T7HMlUsF7kS18auTIk6OmBC9WJQZK1C60PsFnZnJezLnAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjktMTctMTMtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTEzLWRoY3AuYXAtd2xhbi5raS5zZTAdBgNVHQ4EFgQUfiaLdeLuJJlG1gsTwJ8XDXDFoD4wDQYJKoZIhvcNAQEFBQADggEBAE3375TqfWhFnDJCYP9B2ymEm6sVa/W1ZAN1Vv9Dji6YZh3ZcWPFikN5n355p6/hDbZIvH5sHeJIr7jeNrn+zA6BQOL9u8GAq/kgotVwmrx1HsX8Xnd77T2OTcpEPMt1Ag/TRxb+BA5si2g6iZT1fttZ0nOy5nqHH3CKCqXsqaldJSj3TR7JmJ2BKbNe5asqwyTsjSuUtzhf0Vx2j5OC6sxcOVQIY6zj9KCyuhI+aE0R5KMY/hSdqlvAq64/M8//lIZtOOn4h+rbmZuNyraTEHCh2EfahMrCTfVeygUpnEq9UdgLgR81te+YoM893VQdiD3fsI3jxBxSRoXqQK2qVuM=</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>130-229-17-13-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-13-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAJIiPey1w1Y0MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIDEzMC0yMjktMTctMTMtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTExMzI1OFoXDTE5MDQxOTExMzI1OFowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0xMy1kaGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBUfcpI8oajZ2RJVjGNM3pUrmuvw/Hi6qRwAHjNnhGJ86BGbj4BIr98mekFa0S7diKmW/C9WzPGuk+tXz0FBXenETS2zJhhoKgdUwFqp66GUxF8SMr331UPV0be5wFtuFnAfQrX/2spYbTfXbsUiXkbSALqrybYoZKvhHj4MPtYV8nWjfiDlRQJdL8EhnYlHbVPIpwHrNt2r3ikDtIoAdtKE/1rvXJBwnQ4CBgjpXG/8HHWiXxQzlN0HKeIwUcuIXJlP+vAKE90VT8QUVQNeq/GnqS6ddTJ8TR8jMuL3c2T7HMlUsF7kS18auTIk6OmBC9WJQZK1C60PsFnZnJezLnAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjktMTctMTMtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTEzLWRoY3AuYXAtd2xhbi5raS5zZTAdBgNVHQ4EFgQUfiaLdeLuJJlG1gsTwJ8XDXDFoD4wDQYJKoZIhvcNAQEFBQADggEBAE3375TqfWhFnDJCYP9B2ymEm6sVa/W1ZAN1Vv9Dji6YZh3ZcWPFikN5n355p6/hDbZIvH5sHeJIr7jeNrn+zA6BQOL9u8GAq/kgotVwmrx1HsX8Xnd77T2OTcpEPMt1Ag/TRxb+BA5si2g6iZT1fttZ0nOy5nqHH3CKCqXsqaldJSj3TR7JmJ2BKbNe5asqwyTsjSuUtzhf0Vx2j5OC6sxcOVQIY6zj9KCyuhI+aE0R5KMY/hSdqlvAq64/M8//lIZtOOn4h+rbmZuNyraTEHCh2EfahMrCTfVeygUpnEq9UdgLgR81te+YoM893VQdiD3fsI3jxBxSRoXqQK2qVuM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-17-13-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130-229-17-158-dhcp.ap-wlan.ki.se.xml b/nya-workshop/130-229-17-158-dhcp.ap-wlan.ki.se.xml
deleted file mode 100644
index e6292975..00000000
--- a/nya-workshop/130-229-17-158-dhcp.ap-wlan.ki.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-17-158-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-17-158-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-158-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAO//s6EsP45JMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTU4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTUwNTBaFw0xOTA0MTkxMTUwNTBaMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTU4LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhrr4OUiKuX5uQK1Jn7jy3NCIaGshkba6+WkIChxuim9VLOmYbFr30mu3ni4OoLYyLIGNPsWFqmAU6SpSr2CaBO4p71qWxUhToCbVLF1phvfDU8r4WEWDlrsPMfw0DQRutTQBPk2+9xBkuujIc4k3ItT4ALDAxyNhBMUyy1T7Q1pZfuY2y09/7TKwW7WdbuqWaBAPGOdu2lSAjZBqeNvePB3Yf9Up4Zut7C6HWejs2yYwiNjyvTWACdEAkan+wDaAW8UbZ6YO7xJWm0XNaPktf7CSOZWZJxRRq7Sb9kraHfUD/ZatD29MhG/7a1WI7MW05O4H0xsH0bhEmyymGAKYsCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNy0xNTgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE3LTE1OC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFCsyKotHLJnM+p12mtZu2BD746ieMA0GCSqGSIb3DQEBBQUAA4IBAQB2Q1qAzG0wclC5NP3c6UpEZAQ4QEN8E1vatu4URtLWUicrtaADW1hM6HXNthfrTWouPKDhPYqWGe7RV9y/MI0J/OxMk39KdEJftH+pxoTV1ItBDYCr5rAMmf9f2HUOzc/bAVpeFR2gUFFF609DOa2nqDPkxCSKQxvslZX/Xbmx3Ic88YksVPnNzFuKsYYz7ch6zlqfbNdWscv/msFDcf+4ywUDP1VBM3PPsWVERY6lEsvQgS/O4ZA+irTJiLoB7lwikVddcbYji4zu7ibofwLkEkX4LkceBGEhC5Z+ZBZ23LbOscwv/U4bi8+H6/aSAbqzKLve89lEJNcPZKcZNH6s</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>130-229-17-158-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-158-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAO//s6EsP45JMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTU4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTUwNTBaFw0xOTA0MTkxMTUwNTBaMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTU4LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhrr4OUiKuX5uQK1Jn7jy3NCIaGshkba6+WkIChxuim9VLOmYbFr30mu3ni4OoLYyLIGNPsWFqmAU6SpSr2CaBO4p71qWxUhToCbVLF1phvfDU8r4WEWDlrsPMfw0DQRutTQBPk2+9xBkuujIc4k3ItT4ALDAxyNhBMUyy1T7Q1pZfuY2y09/7TKwW7WdbuqWaBAPGOdu2lSAjZBqeNvePB3Yf9Up4Zut7C6HWejs2yYwiNjyvTWACdEAkan+wDaAW8UbZ6YO7xJWm0XNaPktf7CSOZWZJxRRq7Sb9kraHfUD/ZatD29MhG/7a1WI7MW05O4H0xsH0bhEmyymGAKYsCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNy0xNTgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE3LTE1OC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFCsyKotHLJnM+p12mtZu2BD746ieMA0GCSqGSIb3DQEBBQUAA4IBAQB2Q1qAzG0wclC5NP3c6UpEZAQ4QEN8E1vatu4URtLWUicrtaADW1hM6HXNthfrTWouPKDhPYqWGe7RV9y/MI0J/OxMk39KdEJftH+pxoTV1ItBDYCr5rAMmf9f2HUOzc/bAVpeFR2gUFFF609DOa2nqDPkxCSKQxvslZX/Xbmx3Ic88YksVPnNzFuKsYYz7ch6zlqfbNdWscv/msFDcf+4ywUDP1VBM3PPsWVERY6lEsvQgS/O4ZA+irTJiLoB7lwikVddcbYji4zu7ibofwLkEkX4LkceBGEhC5Z+ZBZ23LbOscwv/U4bi8+H6/aSAbqzKLve89lEJNcPZKcZNH6s</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-17-158-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130-229-17-24-dhcp.ap-wlan.ki.se.xml b/nya-workshop/130-229-17-24-dhcp.ap-wlan.ki.se.xml
deleted file mode 100644
index 93c93632..00000000
--- a/nya-workshop/130-229-17-24-dhcp.ap-wlan.ki.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-17-24-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-17-24-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-24-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAP0VioChKmy6MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIDEzMC0yMjktMTctMjQtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTExNDM0MloXDTE5MDQxOTExNDM0MlowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0yNC1kaGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4HP9TCvzT5KNSwPoQzzMlLQKPDtV8msYeZ5u0w5WdyS1K/r7xJvbVP31WOPXL8aHiyDh421Nep35Gnje6ct53T6yOaKDk5NT/UF7fT0xZ5MqKSsRaRxc9okiK/q6XjpO5Amf3DvvLst49MSaM+wQivaK7gU84bmo3QtdZJErQmtBz6ezWPh3kCLXLD7Fb9qb2QKa0ZM4FMmClMGmP+klIluSZThXTG7ziQyoEgeslVGs8AxFEWZsGpLJQKFWjY/LXaMyNTTT0+WE9e+Q/y6zMjSKeWHrHP20gY/5O2+cECarQDHDcml0Sjw7z89yWsPFviR2JsGr9Uyc9pi6t6WgDAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjktMTctMjQtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTI0LWRoY3AuYXAtd2xhbi5raS5zZTAdBgNVHQ4EFgQUoouRu3hmBYVFRonbl3BJXExFenMwDQYJKoZIhvcNAQEFBQADggEBALCsjdAzOnzrMwUejv848Xy5J43oHvaVlFfocftCGJ7qOoa1t/w2bCe+5o1oWiOdCwWDl2cq0CrgFPgKrUjdcaJO1hslqws4pUI5nOgX1++TkhF7ZaP9u22HfHPX9d6M35WrqH8CLDq2T7+gOEw4uQUZ7fqn3cJF82nKHBtHtQ9uLs81MtYBMukipyZxrPk/ZjF9m7Yp6g8TrMmtRaZlUscBg5PutG/xjxuL26+b50Y9gAR0Ye6lECzHP+/VVPj5w+s0XsoE7A0mUYjVmxm2x/AaeaSHAerz9qiKeGGn+qq+eyUId9QDCTffXoyyhvok8TXet8iStYvz6FAGxtgjYq0=</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>130-229-17-24-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-24-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAP0VioChKmy6MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIDEzMC0yMjktMTctMjQtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTExNDM0MloXDTE5MDQxOTExNDM0MlowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0yNC1kaGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4HP9TCvzT5KNSwPoQzzMlLQKPDtV8msYeZ5u0w5WdyS1K/r7xJvbVP31WOPXL8aHiyDh421Nep35Gnje6ct53T6yOaKDk5NT/UF7fT0xZ5MqKSsRaRxc9okiK/q6XjpO5Amf3DvvLst49MSaM+wQivaK7gU84bmo3QtdZJErQmtBz6ezWPh3kCLXLD7Fb9qb2QKa0ZM4FMmClMGmP+klIluSZThXTG7ziQyoEgeslVGs8AxFEWZsGpLJQKFWjY/LXaMyNTTT0+WE9e+Q/y6zMjSKeWHrHP20gY/5O2+cECarQDHDcml0Sjw7z89yWsPFviR2JsGr9Uyc9pi6t6WgDAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjktMTctMjQtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTI0LWRoY3AuYXAtd2xhbi5raS5zZTAdBgNVHQ4EFgQUoouRu3hmBYVFRonbl3BJXExFenMwDQYJKoZIhvcNAQEFBQADggEBALCsjdAzOnzrMwUejv848Xy5J43oHvaVlFfocftCGJ7qOoa1t/w2bCe+5o1oWiOdCwWDl2cq0CrgFPgKrUjdcaJO1hslqws4pUI5nOgX1++TkhF7ZaP9u22HfHPX9d6M35WrqH8CLDq2T7+gOEw4uQUZ7fqn3cJF82nKHBtHtQ9uLs81MtYBMukipyZxrPk/ZjF9m7Yp6g8TrMmtRaZlUscBg5PutG/xjxuL26+b50Y9gAR0Ye6lECzHP+/VVPj5w+s0XsoE7A0mUYjVmxm2x/AaeaSHAerz9qiKeGGn+qq+eyUId9QDCTffXoyyhvok8TXet8iStYvz6FAGxtgjYq0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130-229-19-155-dhcp.ap-wlan.ki.se.xml b/nya-workshop/130-229-19-155-dhcp.ap-wlan.ki.se.xml
deleted file mode 100644
index 1c7dfd80..00000000
--- a/nya-workshop/130-229-19-155-dhcp.ap-wlan.ki.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-19-155-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-19-155-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-155-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAMPPujWXzBBSMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTIzMzZaFw0xOTA0MTkxMTIzMzZaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM41bTvE90dAPHxCeRqNnkY9/D8g17tcKWLSVC1+TVId7QQJGAZP05bYYVPY07YxuLzI6xYQSxEExmUG/qwl9hmdodLro70GnHo04gF/tmlOK4KNe4zuX6ho3yxLIgCkiJqmCXGoR1Jk9MkzV64+Jv6hqIQqnAH9nJCrr7Vp8t+xLTYGwgKQo5Kz+7sfMCFocsZAbHpTxY5pAFj2xwymDNKgiaFP2f5Ii54BtkFzLwLgTD+m9PFgye9fx2Lz99JSuRNKqRXvEJJ4oIFDMDn6JJK7SB8NzmxQiDVQ/R8ufWGhmNcPGOhpFpv/8ZLqnhXwSF7RMWgB3Ika9fxNcbe1+7ECAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0xNTUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTE1NS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFBXQPrsWlM3qxwlwtBxG3BAPUv4EMA0GCSqGSIb3DQEBBQUAA4IBAQBb7qJmT/xZiwbvyeqyWhJHEu9BBG31DRfWhofRUsC/cil+FWP+gYRKa8oTeY/f9FK+kiAuQied9K2VpvA4J2KLXOJUlFpZRKP280v8euMeaun/cP9Qf3YikJ8grzAivm9XRvlpoz891K7D+46LYFBCWn31qawYsqUJ663HPGlnFO33dvj0Fu8HK0JyvCh3tcHhfjs7If/b/wMbsenlgmxf1m5zmAcYYU9zicEyNliOmUIHb66htJAdN7oSuWCXu5sy7BWgIi0P6b0vglo3rLsFfoQZV3vBhoFJCBjCffDbTslgI7byFWfZaIfrYm/qhEzA2rMGP84kAW2spCA5x3+h</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>130-229-19-155-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-155-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAMPPujWXzBBSMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTIzMzZaFw0xOTA0MTkxMTIzMzZaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM41bTvE90dAPHxCeRqNnkY9/D8g17tcKWLSVC1+TVId7QQJGAZP05bYYVPY07YxuLzI6xYQSxEExmUG/qwl9hmdodLro70GnHo04gF/tmlOK4KNe4zuX6ho3yxLIgCkiJqmCXGoR1Jk9MkzV64+Jv6hqIQqnAH9nJCrr7Vp8t+xLTYGwgKQo5Kz+7sfMCFocsZAbHpTxY5pAFj2xwymDNKgiaFP2f5Ii54BtkFzLwLgTD+m9PFgye9fx2Lz99JSuRNKqRXvEJJ4oIFDMDn6JJK7SB8NzmxQiDVQ/R8ufWGhmNcPGOhpFpv/8ZLqnhXwSF7RMWgB3Ika9fxNcbe1+7ECAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0xNTUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTE1NS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFBXQPrsWlM3qxwlwtBxG3BAPUv4EMA0GCSqGSIb3DQEBBQUAA4IBAQBb7qJmT/xZiwbvyeqyWhJHEu9BBG31DRfWhofRUsC/cil+FWP+gYRKa8oTeY/f9FK+kiAuQied9K2VpvA4J2KLXOJUlFpZRKP280v8euMeaun/cP9Qf3YikJ8grzAivm9XRvlpoz891K7D+46LYFBCWn31qawYsqUJ663HPGlnFO33dvj0Fu8HK0JyvCh3tcHhfjs7If/b/wMbsenlgmxf1m5zmAcYYU9zicEyNliOmUIHb66htJAdN7oSuWCXu5sy7BWgIi0P6b0vglo3rLsFfoQZV3vBhoFJCBjCffDbTslgI7byFWfZaIfrYm/qhEzA2rMGP84kAW2spCA5x3+h</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-19-155-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.16.234.xml b/nya-workshop/130.229.16.234.xml
deleted file mode 100644
index a4ac73ca..00000000
--- a/nya-workshop/130.229.16.234.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-16-234-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-16-234-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-16-234-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAP1JEdtVwwKGMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-BAMTITEzMC0yMjktMTYtMjM0LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjEx
-MjA1MzJaFw0xOTA0MTkxMjA1MzJaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM0
-LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALvRB6MbKocJXxQMHecE25U9syQqFJWSZNpnEzkT1rSYgSQ2gtn99a013IXy
-OR6TE4p1YsB4AzPVcEksL6F0u0reWsUb2+Bo9WFVKSIY/HDyyXWzrKc+EhDtxUwt
-Kj2EhjoGBBpll3XR1ebM/vV9UwrkA7kn7VqY+HYhsXDYNtG07crt4zQsB9oIdUsc
-+MG6w9phZ5beqv3EuxLym9ddP0XirEy9NSCIP9L8FeVhhgqlTbPQvPFQ5KVT5Ju7
-Xpfb0fEdHE+1UMvEJs5xYBl3jVoaf09AqADDbrtmBKrNSwYTxDNMD9FIEogm76WT
-8N0l1Dr3ims1I8GZBlIbOXCnEP8CAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIy
-OS0xNi0yMzQtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzNC1kaGNw
-LmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFMXd/cVZ8gfxhL5ObtHIlHlnrKSFMA0G
-CSqGSIb3DQEBBQUAA4IBAQAYAIvewI1TFaVfppBYG4b0AupYXF+HPY9Btoj5r0GO
-cxlYy3Kq5/1Q/Dlac/TDkw+/ncPze75uwsw3kncZ+4jvPLXbFcfpWVa/Q5mDD74A
-hIC2tgPIQYyG0Ou92Cdeht+LWI1JiDd8IicHCXDZ07Td8MPPYIi6iXalfW6JzMgU
-Eb9++V578veC6VoRmJuyFXO1In3Rp5ejcfwVmo3NVwSaMRxkGqJf5QzMvM8K2Lrm
-zKJzTP9g8G1e5Mid9O4950qjnfCYW2czOTMgMe/5j7ICyrAtjP4r4VdpbRXGYhgs
-WgrtkJANZ22AujnPfSIV3b+5IIqEJRwxtkTCTgIt/Ldh
-</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>130-229-16-234-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-16-234-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAP1JEdtVwwKGMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-BAMTITEzMC0yMjktMTYtMjM0LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjEx
-MjA1MzJaFw0xOTA0MTkxMjA1MzJaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM0
-LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALvRB6MbKocJXxQMHecE25U9syQqFJWSZNpnEzkT1rSYgSQ2gtn99a013IXy
-OR6TE4p1YsB4AzPVcEksL6F0u0reWsUb2+Bo9WFVKSIY/HDyyXWzrKc+EhDtxUwt
-Kj2EhjoGBBpll3XR1ebM/vV9UwrkA7kn7VqY+HYhsXDYNtG07crt4zQsB9oIdUsc
-+MG6w9phZ5beqv3EuxLym9ddP0XirEy9NSCIP9L8FeVhhgqlTbPQvPFQ5KVT5Ju7
-Xpfb0fEdHE+1UMvEJs5xYBl3jVoaf09AqADDbrtmBKrNSwYTxDNMD9FIEogm76WT
-8N0l1Dr3ims1I8GZBlIbOXCnEP8CAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIy
-OS0xNi0yMzQtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzNC1kaGNw
-LmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFMXd/cVZ8gfxhL5ObtHIlHlnrKSFMA0G
-CSqGSIb3DQEBBQUAA4IBAQAYAIvewI1TFaVfppBYG4b0AupYXF+HPY9Btoj5r0GO
-cxlYy3Kq5/1Q/Dlac/TDkw+/ncPze75uwsw3kncZ+4jvPLXbFcfpWVa/Q5mDD74A
-hIC2tgPIQYyG0Ou92Cdeht+LWI1JiDd8IicHCXDZ07Td8MPPYIi6iXalfW6JzMgU
-Eb9++V578veC6VoRmJuyFXO1In3Rp5ejcfwVmo3NVwSaMRxkGqJf5QzMvM8K2Lrm
-zKJzTP9g8G1e5Mid9O4950qjnfCYW2czOTMgMe/5j7ICyrAtjP4r4VdpbRXGYhgs
-WgrtkJANZ22AujnPfSIV3b+5IIqEJRwxtkTCTgIt/Ldh
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-16-234-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.16.238.xml b/nya-workshop/130.229.16.238.xml
deleted file mode 100644
index 5c8012a1..00000000
--- a/nya-workshop/130.229.16.238.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-16-238-dhcp.ap-wlan.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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-16-238-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-16-238-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOzurRJx5hUvMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExNDIwNDlaFw0xOTA0MTkxNDIwNDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0hol5vp2lftRb3EP2UovcrWU4eo6fSnxjsAOQuJXGFEPvl+BoyYo/LsypHMI6510X2zVrm2q9UZUHLlf5cAjNzpmehbiErGF2eYzb9LFJbUzYdQnTwqLI9Xs+fXyBWG7Nfm65V2ymagkyQCltl8JnV+j0IsWkPipM+LEKJo7KBadnSkIDg7nr6LM4jGCyTuCUijmJ8pZqFlrHkcmLLzmuK6W/1xjHAR0bHfOqVeSZN2kEGz11EhqY2/qcBvFpxYgkwhPbwNVOGnaCNrYFfoKtBG7/GC63wNdBpauOilvPn+m63bguS6lnkRl2jTg4X1AoOt8YyinE/a1DWrc7aGisCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNi0yMzgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzOC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFGIIBuGXADoGUr1hvFvNv3y547rhMA0GCSqGSIb3DQEBBQUAA4IBAQAqU6P4wIFqYBzmQQdI3ABSx44sLD/deWX9ukD+uWiBnQ77eY41C0G2KIXfaSojcec+D7sJEDZsbjY1+R8YR1K4UhNcKHOgI/vPXrKkKeyLac1/G4V9w9S8MSK7o4+Y06yWLqAV/2dIXMo4kKa43IlpYz7ygRAwtAUFWueZEExOThP81BKNMguv4KxoPsSLdYtsZkYnfVTiK6jNitxci3t0RPF/YwGOqw38KkVW/NTWgPuua9/Jj6c5WWML8uzKc39Jzh7X0C1iwDPKdhcVOAPKSLGNBs2p0OAeguRrX9ON7YRs5nK4eVIcRjFIKS67ShaSi6/zuQq20zr9huoKFcqt</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>130-229-16-238-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-16-238-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOzurRJx5hUvMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExNDIwNDlaFw0xOTA0MTkxNDIwNDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjM4LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0hol5vp2lftRb3EP2UovcrWU4eo6fSnxjsAOQuJXGFEPvl+BoyYo/LsypHMI6510X2zVrm2q9UZUHLlf5cAjNzpmehbiErGF2eYzb9LFJbUzYdQnTwqLI9Xs+fXyBWG7Nfm65V2ymagkyQCltl8JnV+j0IsWkPipM+LEKJo7KBadnSkIDg7nr6LM4jGCyTuCUijmJ8pZqFlrHkcmLLzmuK6W/1xjHAR0bHfOqVeSZN2kEGz11EhqY2/qcBvFpxYgkwhPbwNVOGnaCNrYFfoKtBG7/GC63wNdBpauOilvPn+m63bguS6lnkRl2jTg4X1AoOt8YyinE/a1DWrc7aGisCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNi0yMzgtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTIzOC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFGIIBuGXADoGUr1hvFvNv3y547rhMA0GCSqGSIb3DQEBBQUAA4IBAQAqU6P4wIFqYBzmQQdI3ABSx44sLD/deWX9ukD+uWiBnQ77eY41C0G2KIXfaSojcec+D7sJEDZsbjY1+R8YR1K4UhNcKHOgI/vPXrKkKeyLac1/G4V9w9S8MSK7o4+Y06yWLqAV/2dIXMo4kKa43IlpYz7ygRAwtAUFWueZEExOThP81BKNMguv4KxoPsSLdYtsZkYnfVTiK6jNitxci3t0RPF/YwGOqw38KkVW/NTWgPuua9/Jj6c5WWML8uzKc39Jzh7X0C1iwDPKdhcVOAPKSLGNBs2p0OAeguRrX9ON7YRs5nK4eVIcRjFIKS67ShaSi6/zuQq20zr9huoKFcqt</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-16-238-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.16.240.xml b/nya-workshop/130.229.16.240.xml
deleted file mode 100644
index 4cfa086c..00000000
--- a/nya-workshop/130.229.16.240.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-16-240-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-16-240-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-16-240-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAJtanXQ+JJ2/MA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjQwLWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTQ4MTlaFw0xOTA0MTkxMTQ4MTlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjQwLWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMovJdqOB3Lip1AgX66Omu+c75AzCTvcwXKUM3nyOZZR8J5A/FNet/Ch+q2iKg96vGqsdSaW5b/mYhvAI7wV34xNAfg2OWI8OpYn76YxB0tQVjQ5miL3oNz76OqqlUZ9HOB1ZCfMNljyyJEMcLwSROjosCJqdSM6kbP37NDp9zoVXxWW6rH8Eiaf44S4QeCJwi+zEqPp/7rs+S7kRX9H1Y0SQdZTNisNiOfjgiyGazXbLeSxnm3EsJUHGMEBq4oxtOzgLYN/uhmhv8r4WTPmC5FqhV6G8EIBlfMBNWJhWyqLfvgl/P1m5VZk/rHEKQkFbDA+OtAl8wlrcTLqwQCi4RUCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNi0yNDAtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTI0MC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFMDoMmtCEcsw9L0p+xXoVqt6Ce8DMA0GCSqGSIb3DQEBBQUAA4IBAQBz7bLXjOx2hAOB7d88S9NVX11x/DXL+X+Ce7paGI+83VS8eyzbfbINHhJP/wjfpLW7w3NiUf55PQWNeshSZ3O6MOGxZZGOKd7dK4KZdY7CKtDWTVW7ZONMp8kHWhCZkJ/yZbc81oo5pJSMJj90GDCzQi7Xgok1uZsBW/L8Y3BTARA6lydoZ32t/S06uyj0CI6PNGfelXSnXYNnbI/wcxW2/agg923GKEYLI7uS9cfi770vKcOvMPJEj2Zuhxj3E6dMNugDuQrZD+SFBpySZ8yN4CX3z1Az2GsQ+/MbzwO7JklHvIo0+thnY1wNriAVicbGUzaVMs2PI9Cmj13K+a2D</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>130-229-16-240-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-16-240-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAJtanXQ+JJ2/MA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjQwLWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTQ4MTlaFw0xOTA0MTkxMTQ4MTlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTYtMjQwLWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMovJdqOB3Lip1AgX66Omu+c75AzCTvcwXKUM3nyOZZR8J5A/FNet/Ch+q2iKg96vGqsdSaW5b/mYhvAI7wV34xNAfg2OWI8OpYn76YxB0tQVjQ5miL3oNz76OqqlUZ9HOB1ZCfMNljyyJEMcLwSROjosCJqdSM6kbP37NDp9zoVXxWW6rH8Eiaf44S4QeCJwi+zEqPp/7rs+S7kRX9H1Y0SQdZTNisNiOfjgiyGazXbLeSxnm3EsJUHGMEBq4oxtOzgLYN/uhmhv8r4WTPmC5FqhV6G8EIBlfMBNWJhWyqLfvgl/P1m5VZk/rHEKQkFbDA+OtAl8wlrcTLqwQCi4RUCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNi0yNDAtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE2LTI0MC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFMDoMmtCEcsw9L0p+xXoVqt6Ce8DMA0GCSqGSIb3DQEBBQUAA4IBAQBz7bLXjOx2hAOB7d88S9NVX11x/DXL+X+Ce7paGI+83VS8eyzbfbINHhJP/wjfpLW7w3NiUf55PQWNeshSZ3O6MOGxZZGOKd7dK4KZdY7CKtDWTVW7ZONMp8kHWhCZkJ/yZbc81oo5pJSMJj90GDCzQi7Xgok1uZsBW/L8Y3BTARA6lydoZ32t/S06uyj0CI6PNGfelXSnXYNnbI/wcxW2/agg923GKEYLI7uS9cfi770vKcOvMPJEj2Zuhxj3E6dMNugDuQrZD+SFBpySZ8yN4CX3z1Az2GsQ+/MbzwO7JklHvIo0+thnY1wNriAVicbGUzaVMs2PI9Cmj13K+a2D</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-16-240-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.17.145.xml b/nya-workshop/130.229.17.145.xml
deleted file mode 100644
index ff6c596a..00000000
--- a/nya-workshop/130.229.17.145.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-17-145-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-17-145-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-145-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAI6U/1GSEDnoMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTQ1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTM4MDlaFw0xOTA0MTkxMTM4MDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTQ1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMag42UDcOAFcwEM7hVCOZFgTcoTbt9Jy2S9hHgP/90J5rzzO9nwSj9yDnhkUMcT9NWStAOT4JdVJfQmO7Q2a/lY5il/u/eYxBQnZNLjWVLq2HUaW6JVgSlc0JC68oYo4l/wnnejApRaQ0wRpsEwKxg5xy3i99GOh1m+73XZ3/UB9YKdGQiBarNyOdc/tUqCqz9GSU3LRD271YpWh95a/RIRqRvh7W7nSSm1TicpI41Q4vjRqNxsmJiIeJrXTnPKiuOlyb4EoHTc2tp7bZ9P6RFepwE5C82lC54hg1INCjRIE7W1gaaqLWUspD7CVQN7UoCYHW/H55AwesluM9C4iV0CAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNy0xNDUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE3LTE0NS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFD73LTyzHMAXpq5rVVoZUUhd+htMMA0GCSqGSIb3DQEBBQUAA4IBAQC2GKkeLgaeEwcVL533dhbPbdfc9dZefEzXk6vrcO3WZsFXFlD7ty4lDDCm/d+zDeQkY00DFCqd635E61xCDwy87WLd3HdEuTG9U4uwl0jmeOm66BtuRC/gAi27K0IRCMR/IWL4NkbdJxG7Y0vbAp9h2LojeRdBjktH3vaTog5IEPQuXP0FUQbmGCjJqNWo+jZOxOBDtrrJIEk8cFUUnbfyX5FzefKjOvK1VXQ7r1kaUf0rU/AiAwMk0EZLHCJ/dIQ049CtzqfNbJ5AEeqwigkQwvj1iJ5MeOfX7XwbV/WJ9UDZQKjsyw2RbmEbGllg+MSVgruk2tAY3vp4jzouvWxv</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>130-229-17-145-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-145-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAI6U/1GSEDnoMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTQ1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTM4MDlaFw0xOTA0MTkxMTM4MDlaMCwxKjAoBgNVBAMTITEzMC0yMjktMTctMTQ1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMag42UDcOAFcwEM7hVCOZFgTcoTbt9Jy2S9hHgP/90J5rzzO9nwSj9yDnhkUMcT9NWStAOT4JdVJfQmO7Q2a/lY5il/u/eYxBQnZNLjWVLq2HUaW6JVgSlc0JC68oYo4l/wnnejApRaQ0wRpsEwKxg5xy3i99GOh1m+73XZ3/UB9YKdGQiBarNyOdc/tUqCqz9GSU3LRD271YpWh95a/RIRqRvh7W7nSSm1TicpI41Q4vjRqNxsmJiIeJrXTnPKiuOlyb4EoHTc2tp7bZ9P6RFepwE5C82lC54hg1INCjRIE7W1gaaqLWUspD7CVQN7UoCYHW/H55AwesluM9C4iV0CAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xNy0xNDUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE3LTE0NS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFD73LTyzHMAXpq5rVVoZUUhd+htMMA0GCSqGSIb3DQEBBQUAA4IBAQC2GKkeLgaeEwcVL533dhbPbdfc9dZefEzXk6vrcO3WZsFXFlD7ty4lDDCm/d+zDeQkY00DFCqd635E61xCDwy87WLd3HdEuTG9U4uwl0jmeOm66BtuRC/gAi27K0IRCMR/IWL4NkbdJxG7Y0vbAp9h2LojeRdBjktH3vaTog5IEPQuXP0FUQbmGCjJqNWo+jZOxOBDtrrJIEk8cFUUnbfyX5FzefKjOvK1VXQ7r1kaUf0rU/AiAwMk0EZLHCJ/dIQ049CtzqfNbJ5AEeqwigkQwvj1iJ5MeOfX7XwbV/WJ9UDZQKjsyw2RbmEbGllg+MSVgruk2tAY3vp4jzouvWxv</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-17-145-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.17.20.xml b/nya-workshop/130.229.17.20.xml
deleted file mode 100644
index b78009c3..00000000
--- a/nya-workshop/130.229.17.20.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-17-20-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-17-20-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-20-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJANczZLwt1MUtMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIDEzMC0yMjktMTctMjAtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTExNTcxOVoXDTE5MDQxOTExNTcxOVowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0yMC1kaGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIxDT8kkb6IE3OTxsv0a+PzYphUzFzqdC3xy1qKpYwnM3f9+DDeaVDNLbqkNxPDwRm2zMqgIQjftJhkywPa0Hna/owWQvuahgj2wsgt/VbAFe18xIW4KOX2P6pTcy1QNa0Hig8RBbHuqLpniWhbyc4dNYjG/ZFsgAGm2DiATlBBWB62uWUw5SBE/KJx4UCiKFUOqrBbQKq1Esxbf9vjvhy0P5arQudWwDaE1whoeRIRf0nBWl1av/zGDSpgl3AXwFHQo3/UwEjdSfvTFs27HgWxuUNyhsgEUxrQ+80X5aS7ajVM9uckGat4LFgljOtA551yBCmdrRIbg/edXN9S89xAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjktMTctMjAtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTIwLWRoY3AuYXAtd2xhbi5raS5zZTAdBgNVHQ4EFgQUZtYYDF/DHx8tROSSJigLRAAG790wDQYJKoZIhvcNAQEFBQADggEBAMH0iAgtmNBtA4bpctHDi/Bj3YDEQL6bTPguT3cx3SNAkHpmWrc0EsdBobd5oq6aVh/a35xUocSl0EVuCRVBJxLiCjkamTKSyxqLIgcgAtZzGnBb43kSM7lGVAYsIwRXC6+LhdZo1ttKNx9QH7aqgwob0Zf0vVvuZR7NtptO51t/14/XQAZlFFyVJNXAkTRf4JmkPWGdAM2AbkhOkWMU4o8dHIdr45AzdEo1lO7KwFcNPBX0tMOAWU3er0P+sLr1HfgUemCnhoHIWiRvN8SGeimsiEztPehHlXwm50eYscYA0mHS60gWPw0MSovJzVOcgefyakFOV/FAYNj5qwp+Qnw=</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>130-229-17-20-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-20-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJANczZLwt1MUtMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIDEzMC0yMjktMTctMjAtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTExNTcxOVoXDTE5MDQxOTExNTcxOVowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0yMC1kaGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIxDT8kkb6IE3OTxsv0a+PzYphUzFzqdC3xy1qKpYwnM3f9+DDeaVDNLbqkNxPDwRm2zMqgIQjftJhkywPa0Hna/owWQvuahgj2wsgt/VbAFe18xIW4KOX2P6pTcy1QNa0Hig8RBbHuqLpniWhbyc4dNYjG/ZFsgAGm2DiATlBBWB62uWUw5SBE/KJx4UCiKFUOqrBbQKq1Esxbf9vjvhy0P5arQudWwDaE1whoeRIRf0nBWl1av/zGDSpgl3AXwFHQo3/UwEjdSfvTFs27HgWxuUNyhsgEUxrQ+80X5aS7ajVM9uckGat4LFgljOtA551yBCmdrRIbg/edXN9S89xAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjktMTctMjAtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTIwLWRoY3AuYXAtd2xhbi5raS5zZTAdBgNVHQ4EFgQUZtYYDF/DHx8tROSSJigLRAAG790wDQYJKoZIhvcNAQEFBQADggEBAMH0iAgtmNBtA4bpctHDi/Bj3YDEQL6bTPguT3cx3SNAkHpmWrc0EsdBobd5oq6aVh/a35xUocSl0EVuCRVBJxLiCjkamTKSyxqLIgcgAtZzGnBb43kSM7lGVAYsIwRXC6+LhdZo1ttKNx9QH7aqgwob0Zf0vVvuZR7NtptO51t/14/XQAZlFFyVJNXAkTRf4JmkPWGdAM2AbkhOkWMU4o8dHIdr45AzdEo1lO7KwFcNPBX0tMOAWU3er0P+sLr1HfgUemCnhoHIWiRvN8SGeimsiEztPehHlXwm50eYscYA0mHS60gWPw0MSovJzVOcgefyakFOV/FAYNj5qwp+Qnw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-17-20-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.17.5.xml b/nya-workshop/130.229.17.5.xml
deleted file mode 100644
index edf52c84..00000000
--- a/nya-workshop/130.229.17.5.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-17-5-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-17-5-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-5-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIJALcDZ/5M4rp3MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNVBAMTHzEzMC0yMjktMTctNS1kaGNwLmFwLXdsYW4ua2kuc2UwHhcNMDkwNDIxMDk1NzE0WhcNMTkwNDE5MDk1NzE0WjAqMSgwJgYDVQQDEx8xMzAtMjI5LTE3LTUtZGhjcC5hcC13bGFuLmtpLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApF0vpBZq6U87bXlQ3uhvYKm5lrcgmJVIasZA44ziKCUKSaKIcvqJjIk451+ma4e9FZx0eYrk19tRmkObmzyMpICW69Z/vluJvQIpi1gp8WwL5NYjgMdcbCGNwS8hU3oWEsuMl+FpE7TKxD/GnTEd5UAntyZAMwpwn7JL6KymEUYlywePiItwOFF/vsUPIAeAMKwnRZz+sZLLbZEAY6Qt5VgG9VpvPTuAsFzZqp5+yaCNvJJygNZ/kbsEWGUJd5pfKYI+Jy4mbjPAW68FMhzOkXZ/1mNNMVkDmoUPNUh2k1ApdjPtpgQQBTGYuuest52801vL71Hashuy8cdJTOR94QIDAQABo24wbDBLBgNVHREERDBCgh8xMzAtMjI5LTE3LTUtZGhjcC5hcC13bGFuLmtpLnNlhh8xMzAtMjI5LTE3LTUtZGhjcC5hcC13bGFuLmtpLnNlMB0GA1UdDgQWBBRYxs1GFh+SRU4Z/QnY9EWMVvTgVzANBgkqhkiG9w0BAQUFAAOCAQEAUwozX6PMS4xCHsMscsyUE/w5eDpM1Kn4vIUNqkSusIM0Fszgwjxr7uwJDI0zu0z8iNltmDry5JyC0kp8B2CroHzdWBEinObV8M2HyBt039EsR7hMVX8bx9jmZn3xKcqo1EgVAIgMDD9WbEL0Y26PgG/B5BndEhv8ijT7iNLk/ksigxcBp96sOviqVNHd/pOTnaoXRzkSGaysp6Nw/xXwWnM7JwmHI/UfWpw5W54Ir3Ne7ubHvcK/OPNYfK/Kgrtml7fK1rrG5j8jMSPlJw6smE/PIXJGGqOeVZlTDGS4DW4YDzCGQG+RpHfyjzOKRdwEqbgVR39LwJi1XePs+v2+Wg==</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>130-229-17-5-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-17-5-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIJALcDZ/5M4rp3MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNVBAMTHzEzMC0yMjktMTctNS1kaGNwLmFwLXdsYW4ua2kuc2UwHhcNMDkwNDIxMDk1NzE0WhcNMTkwNDE5MDk1NzE0WjAqMSgwJgYDVQQDEx8xMzAtMjI5LTE3LTUtZGhjcC5hcC13bGFuLmtpLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApF0vpBZq6U87bXlQ3uhvYKm5lrcgmJVIasZA44ziKCUKSaKIcvqJjIk451+ma4e9FZx0eYrk19tRmkObmzyMpICW69Z/vluJvQIpi1gp8WwL5NYjgMdcbCGNwS8hU3oWEsuMl+FpE7TKxD/GnTEd5UAntyZAMwpwn7JL6KymEUYlywePiItwOFF/vsUPIAeAMKwnRZz+sZLLbZEAY6Qt5VgG9VpvPTuAsFzZqp5+yaCNvJJygNZ/kbsEWGUJd5pfKYI+Jy4mbjPAW68FMhzOkXZ/1mNNMVkDmoUPNUh2k1ApdjPtpgQQBTGYuuest52801vL71Hashuy8cdJTOR94QIDAQABo24wbDBLBgNVHREERDBCgh8xMzAtMjI5LTE3LTUtZGhjcC5hcC13bGFuLmtpLnNlhh8xMzAtMjI5LTE3LTUtZGhjcC5hcC13bGFuLmtpLnNlMB0GA1UdDgQWBBRYxs1GFh+SRU4Z/QnY9EWMVvTgVzANBgkqhkiG9w0BAQUFAAOCAQEAUwozX6PMS4xCHsMscsyUE/w5eDpM1Kn4vIUNqkSusIM0Fszgwjxr7uwJDI0zu0z8iNltmDry5JyC0kp8B2CroHzdWBEinObV8M2HyBt039EsR7hMVX8bx9jmZn3xKcqo1EgVAIgMDD9WbEL0Y26PgG/B5BndEhv8ijT7iNLk/ksigxcBp96sOviqVNHd/pOTnaoXRzkSGaysp6Nw/xXwWnM7JwmHI/UfWpw5W54Ir3Ne7ubHvcK/OPNYfK/Kgrtml7fK1rrG5j8jMSPlJw6smE/PIXJGGqOeVZlTDGS4DW4YDzCGQG+RpHfyjzOKRdwEqbgVR39LwJi1XePs+v2+Wg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-17-5-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.17.9.xml b/nya-workshop/130.229.17.9.xml
deleted file mode 100644
index 0d319619..00000000
--- a/nya-workshop/130.229.17.9.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130.229.17.9">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130.229.17.9/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130.229.17.9</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130.229.17.9</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+TCCAeGgAwIBAgIJANusOC7qL+aJMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDDEzMC4yMjkuMTcuOTAeFw0wOTA0MjEwOTQ1MDlaFw0xOTA0MTkwOTQ1MDlaMBcxFTATBgNVBAMTDDEzMC4yMjkuMTcuOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOjCb7HiMK2jYkWqijWAYaLUJBQm1SDBPqQJCJn4ysFFA2cG2sIRjmmc1tSpdHwHMjUGQ9KMmfyy2JdlEKKi7dlVBytpwppLSByFlnFbtZegZEOp7fTDWg2/yDmbumaJk5BZxgVCULb/E9v4hB0hZEN22r32mbIErxhVHFQxjUEA530IbrE/bnQNOHDUZ2UKG9VMqQyYJgunD8T/EImtv5y0T4iC0CdupjIQ7bTa+nFDOTUCcbjWqTwShBuIBdlnGNOOECb5oROjkSCIayBkJoeQHDzLtsj28WZFviNonE8QriRf6z9Jl54dtukLch9Kzt5T2OBfyMy+0gHXUFQ2lECAwEAAaNIMEYwJQYDVR0RBB4wHIIMMTMwLjIyOS4xNy45hgwxMzAuMjI5LjE3LjkwHQYDVR0OBBYEFGjcOB0+WLcui8gHbpUt+TNMIWLpMA0GCSqGSIb3DQEBBQUAA4IBAQCVIlEWoPHjHDt+m5TQDIWnt8EbanzffS1KHeEp2glY2i9LwLrx5ZF1FsTyYCRzVCHJ5pGUw/MfSornAxZe6LvvoYhAqTcTzlJJR+aXPXTtHyawBhEm3DSdyNMbfzwHfIhMY0dsmnw607MWPZsB7FDdfpaJTHnc586N0nThrPWLJLfTnM1zKkjbdV1PLrlrtN9YcFuTb4vDIoqCPTCo3QFzE4Nyal05mfQ29lfoIeeyl5RY4dDFAAYeGIkBa9Y1gChbYY2cOHdd4zgt5wpYjABarWveQKgcHtQ4CKRg91vyvszB8EzKb4nFuNVUEz5lSu20KA7nerMChayYSBvtYPBr</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>130.229.17.9</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130.229.17.9</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+TCCAeGgAwIBAgIJANusOC7qL+aJMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDDEzMC4yMjkuMTcuOTAeFw0wOTA0MjEwOTQ1MDlaFw0xOTA0MTkwOTQ1MDlaMBcxFTATBgNVBAMTDDEzMC4yMjkuMTcuOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOjCb7HiMK2jYkWqijWAYaLUJBQm1SDBPqQJCJn4ysFFA2cG2sIRjmmc1tSpdHwHMjUGQ9KMmfyy2JdlEKKi7dlVBytpwppLSByFlnFbtZegZEOp7fTDWg2/yDmbumaJk5BZxgVCULb/E9v4hB0hZEN22r32mbIErxhVHFQxjUEA530IbrE/bnQNOHDUZ2UKG9VMqQyYJgunD8T/EImtv5y0T4iC0CdupjIQ7bTa+nFDOTUCcbjWqTwShBuIBdlnGNOOECb5oROjkSCIayBkJoeQHDzLtsj28WZFviNonE8QriRf6z9Jl54dtukLch9Kzt5T2OBfyMy+0gHXUFQ2lECAwEAAaNIMEYwJQYDVR0RBB4wHIIMMTMwLjIyOS4xNy45hgwxMzAuMjI5LjE3LjkwHQYDVR0OBBYEFGjcOB0+WLcui8gHbpUt+TNMIWLpMA0GCSqGSIb3DQEBBQUAA4IBAQCVIlEWoPHjHDt+m5TQDIWnt8EbanzffS1KHeEp2glY2i9LwLrx5ZF1FsTyYCRzVCHJ5pGUw/MfSornAxZe6LvvoYhAqTcTzlJJR+aXPXTtHyawBhEm3DSdyNMbfzwHfIhMY0dsmnw607MWPZsB7FDdfpaJTHnc586N0nThrPWLJLfTnM1zKkjbdV1PLrlrtN9YcFuTb4vDIoqCPTCo3QFzE4Nyal05mfQ29lfoIeeyl5RY4dDFAAYeGIkBa9Y1gChbYY2cOHdd4zgt5wpYjABarWveQKgcHtQ4CKRg91vyvszB8EzKb4nFuNVUEz5lSu20KA7nerMChayYSBvtYPBr</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130.229.17.9/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130.229.17.9/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130.229.17.9/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130.229.17.9/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130.229.17.9/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130.229.17.9/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130.229.17.9/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130.229.17.9/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130.229.17.9/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130.229.17.9/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130.229.17.9/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130.229.17.9/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130.229.17.9/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130.229.17.9/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.19.126.xml b/nya-workshop/130.229.19.126.xml
deleted file mode 100644
index f9c1ba4f..00000000
--- a/nya-workshop/130.229.19.126.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-19-126-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-19-126-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-126-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAJ5LTVIKgpPLMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTI2LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMjIxNDNaFw0xOTA0MTkxMjIxNDNaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTI2LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk+ey7SdGK0uWGifx6nk71lsoTOQeIn8qI5W/YWNF+KTaRtP9zkJ87ngKvlmRPwvrRHltvEFnFXotLuJd3MlX8pxxU11Mpq5dqIsB1yGpD7ZaCwv5/G24+TkcXfahcImXhTzM3ii+ahIZKTLxn14AHiQ3Dv+V999NFrzu1mYB6ZpN2O6JWCucNQibHJogvqJPM5+/jsSWfVWqo8tpSTstB1p81D403noqhz5ynQgeUxLybFiU6sHy48uK3SosGGNtiOYMxzowyrZUb6TDb5dVmJ3PSRi+Jq7N8I6drEH0tAs7DOMqR/yEf+Z9mm4pY5kQ0CJf7gAnfZYPZHAkYAajkCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0xMjYtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTEyNi1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFFRgrAaxVaFOwNBAAJx0/wbH27MXMA0GCSqGSIb3DQEBBQUAA4IBAQBmuEg4LermH8z4sm+D8LWvzv6WOG/ET29NDxnfbZ3IWkGAf8IMy9goTlBU+pznTQGAvh9Tl+bRbjgb2iH2mWsjn5/E5PdWhKL4gsBwBJK1klBFUyvIgybK5sX+Zc8XgZgMkB2HF/m3AQw4Vjrb8G9nswyHrEH3aMaW0W8dSBR4QOFc0r6WP2CkGw43rJ+tlFMzC6rEDr0QvThZaX6s7sQvpgX1iS5s8D7xTRVQ9Ail2RzqUTwmMNQcYCc2l89hoq+eKROB/7dXxO46zEThVRM0qa+shFarZqTciacDEpDOR30R9MbjQeESC2/3pzniBtCeq/3mfAOd8Vb5jc2mGUpE</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>130-229-19-126-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-126-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAJ5LTVIKgpPLMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTI2LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMjIxNDNaFw0xOTA0MTkxMjIxNDNaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTI2LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk+ey7SdGK0uWGifx6nk71lsoTOQeIn8qI5W/YWNF+KTaRtP9zkJ87ngKvlmRPwvrRHltvEFnFXotLuJd3MlX8pxxU11Mpq5dqIsB1yGpD7ZaCwv5/G24+TkcXfahcImXhTzM3ii+ahIZKTLxn14AHiQ3Dv+V999NFrzu1mYB6ZpN2O6JWCucNQibHJogvqJPM5+/jsSWfVWqo8tpSTstB1p81D403noqhz5ynQgeUxLybFiU6sHy48uK3SosGGNtiOYMxzowyrZUb6TDb5dVmJ3PSRi+Jq7N8I6drEH0tAs7DOMqR/yEf+Z9mm4pY5kQ0CJf7gAnfZYPZHAkYAajkCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0xMjYtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTEyNi1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFFRgrAaxVaFOwNBAAJx0/wbH27MXMA0GCSqGSIb3DQEBBQUAA4IBAQBmuEg4LermH8z4sm+D8LWvzv6WOG/ET29NDxnfbZ3IWkGAf8IMy9goTlBU+pznTQGAvh9Tl+bRbjgb2iH2mWsjn5/E5PdWhKL4gsBwBJK1klBFUyvIgybK5sX+Zc8XgZgMkB2HF/m3AQw4Vjrb8G9nswyHrEH3aMaW0W8dSBR4QOFc0r6WP2CkGw43rJ+tlFMzC6rEDr0QvThZaX6s7sQvpgX1iS5s8D7xTRVQ9Ail2RzqUTwmMNQcYCc2l89hoq+eKROB/7dXxO46zEThVRM0qa+shFarZqTciacDEpDOR30R9MbjQeESC2/3pzniBtCeq/3mfAOd8Vb5jc2mGUpE</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-19-126-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.19.154.xml b/nya-workshop/130.229.19.154.xml
deleted file mode 100644
index 1af34a05..00000000
--- a/nya-workshop/130.229.19.154.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-19-154-dhcp.ap-wlan.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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130.229.19.154/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-19-154-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-154-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJALOajZF0yDazMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU0LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTM3NThaFw0xOTA0MTkxMTM3NThaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU0LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPhvpobe4rinyA+hWd4lXlr3/mMq4wosFw/daa4HXs7nlA6fv39GVB0MGr8C5c7qoFtlD4kaxUh8wwhk2j87HygQ95G8wxRSHFcC7OT5V5QNge1xeETHDJTn7/Anb+CKQHPVLKxjvQIeXek7llUu1vptKAHiOghEZc0n/4Z/UzUMq1GIzlsBklwynxs6BAePixKy2W7QdrPMAA0uEzl3gjRhtkZtMYfbMymYzIOwZmwhoHm94xFu8rXBUFe7W/JYXTFZ4kkzeFzNeSAhX561PwBEvH9EV29YbMWUkhAI2vinVXJdrVozGi/27q5qoSXu/QXk79Fi3HfV0cYS0LMDxsCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0xNTQtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTE1NC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFBMzhOs7Lqye5M5afQZBdqqdUO+EMA0GCSqGSIb3DQEBBQUAA4IBAQCvTcWgc029U7fsqUsFRzJoFwJpGaHVTjVe9a3nrvv0f5PAkXyLXetsWyY8BXP8hM/oJRMNUwJYp2tY0BosVyQAswrMG0cyqaXygGNHry+dxB4bM+UvjDXTfxLOt8tIVy2J8TCQrvpziFyUaduCznJjbNPsR1L3YNI1kHoail+/pDaebayQgMZGGf9UdKXgLHqR0+7yn0Dr8oMdm6K10xlrhui2RKZo3T/znb9wIb0tPXBfvRtzi2PYUqiUGVYplHJ/172ebuQh1Db/jwWZDE0k9biQoNKeyVcr4xfFEZTXU8Nu6T1jjiY46mwpF8/cCGEhe7vYVYCZNsp5WC8fBPzq</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>130-229-19-154-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-154-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJALOajZF0yDazMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU0LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMTM3NThaFw0xOTA0MTkxMTM3NThaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMTU0LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPhvpobe4rinyA+hWd4lXlr3/mMq4wosFw/daa4HXs7nlA6fv39GVB0MGr8C5c7qoFtlD4kaxUh8wwhk2j87HygQ95G8wxRSHFcC7OT5V5QNge1xeETHDJTn7/Anb+CKQHPVLKxjvQIeXek7llUu1vptKAHiOghEZc0n/4Z/UzUMq1GIzlsBklwynxs6BAePixKy2W7QdrPMAA0uEzl3gjRhtkZtMYfbMymYzIOwZmwhoHm94xFu8rXBUFe7W/JYXTFZ4kkzeFzNeSAhX561PwBEvH9EV29YbMWUkhAI2vinVXJdrVozGi/27q5qoSXu/QXk79Fi3HfV0cYS0LMDxsCAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0xNTQtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTE1NC1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFBMzhOs7Lqye5M5afQZBdqqdUO+EMA0GCSqGSIb3DQEBBQUAA4IBAQCvTcWgc029U7fsqUsFRzJoFwJpGaHVTjVe9a3nrvv0f5PAkXyLXetsWyY8BXP8hM/oJRMNUwJYp2tY0BosVyQAswrMG0cyqaXygGNHry+dxB4bM+UvjDXTfxLOt8tIVy2J8TCQrvpziFyUaduCznJjbNPsR1L3YNI1kHoail+/pDaebayQgMZGGf9UdKXgLHqR0+7yn0Dr8oMdm6K10xlrhui2RKZo3T/znb9wIb0tPXBfvRtzi2PYUqiUGVYplHJ/172ebuQh1Db/jwWZDE0k9biQoNKeyVcr4xfFEZTXU8Nu6T1jjiY46mwpF8/cCGEhe7vYVYCZNsp5WC8fBPzq</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130.229.19.154/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130.229.19.154/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130.229.19.154/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130.229.19.154/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130.229.19.154/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130.229.19.154/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130.229.19.154/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130.229.19.154/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130.229.19.154/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130.229.19.154/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130.229.19.154/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130.229.19.154/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130.229.19.154/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130.229.19.154/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/130.229.19.83.xml b/nya-workshop/130.229.19.83.xml
deleted file mode 100644
index 4ac71968..00000000
--- a/nya-workshop/130.229.19.83.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-19-83-dhcp.ap-wlan.ki.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>130-229-19-83-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-83-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOrsYrcpepCGMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMzE0NThaFw0xOTA0MTkxMzE0NThaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgG9jIH3qKJjYcQmv6TvJmUpoF3nH6OecGQsgyW2tjOV/Xwr5Ww4PN70ENO2+oWoRvJTM9CsX+h9naL6GA6A2GmyY8ZTteODJOPmICA5VkKcGMuuLQ84XYs2WmuaiEQ63kx9ZK/BL7NbswXS48t1JzFqVqpa8GahIBMcbsopf3ImkFJV0l2AlCFF+uUj1UvCitBvkPyWxj5mKfMHzVllRQw7N3AMBbjc219fOuwIKKVH14o/bSLKWvS2Asqaeq80WUrI3wbdsQz+1CpBvhYhnYlGX3Buek0Sp02q6RLMSmGjf6CBL4+AyImTZNobXTNPa2uqFIckNiphpm5EPHIgzECAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0yMjUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTIyNS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFEstf3iOTjXrmgddYtFZsxKN/TEHMA0GCSqGSIb3DQEBBQUAA4IBAQCL6zZhWOouupLeQxJVxmhu0Gwi95+uk0WtrdAuhh4oa3D7BOUy6tuEjQ6umZwF+hIZNBggDM5IoqCcz+MVlQEI/WOtFX6sN8p4uvu53fosdZltD4Eh/a051cc/f+ModjysaBVJ7n5jXgFWue7GlKl9fc/X29sC6FPE9EK3hEHg+sby3QU5llOGSRQl27AkzWIY8Y0zYW0nk/LvfoSH710KLZvcdzgnedMtGZo0kObavmcZtZnb2sxGaR3AuJCYE1elRRaCE103E3hovrhyrLLGQhoqq5PagPJT1NbaS4fYV48OrkuXtL1YwesB/C9K2xiq6Rxz5zGn4zsFaq3Dafai</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>130-229-19-83-dhcp.ap-wlan.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=130-229-19-83-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTTCCAjWgAwIBAgIJAOrsYrcpepCGMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTAeFw0wOTA0MjExMzE0NThaFw0xOTA0MTkxMzE0NThaMCwxKjAoBgNVBAMTITEzMC0yMjktMTktMjI1LWRoY3AuYXAtd2xhbi5raS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgG9jIH3qKJjYcQmv6TvJmUpoF3nH6OecGQsgyW2tjOV/Xwr5Ww4PN70ENO2+oWoRvJTM9CsX+h9naL6GA6A2GmyY8ZTteODJOPmICA5VkKcGMuuLQ84XYs2WmuaiEQ63kx9ZK/BL7NbswXS48t1JzFqVqpa8GahIBMcbsopf3ImkFJV0l2AlCFF+uUj1UvCitBvkPyWxj5mKfMHzVllRQw7N3AMBbjc219fOuwIKKVH14o/bSLKWvS2Asqaeq80WUrI3wbdsQz+1CpBvhYhnYlGX3Buek0Sp02q6RLMSmGjf6CBL4+AyImTZNobXTNPa2uqFIckNiphpm5EPHIgzECAwEAAaNyMHAwTwYDVR0RBEgwRoIhMTMwLTIyOS0xOS0yMjUtZGhjcC5hcC13bGFuLmtpLnNlhiExMzAtMjI5LTE5LTIyNS1kaGNwLmFwLXdsYW4ua2kuc2UwHQYDVR0OBBYEFEstf3iOTjXrmgddYtFZsxKN/TEHMA0GCSqGSIb3DQEBBQUAA4IBAQCL6zZhWOouupLeQxJVxmhu0Gwi95+uk0WtrdAuhh4oa3D7BOUy6tuEjQ6umZwF+hIZNBggDM5IoqCcz+MVlQEI/WOtFX6sN8p4uvu53fosdZltD4Eh/a051cc/f+ModjysaBVJ7n5jXgFWue7GlKl9fc/X29sC6FPE9EK3hEHg+sby3QU5llOGSRQl27AkzWIY8Y0zYW0nk/LvfoSH710KLZvcdzgnedMtGZo0kObavmcZtZnb2sxGaR3AuJCYE1elRRaCE103E3hovrhyrLLGQhoqq5PagPJT1NbaS4fYV48OrkuXtL1YwesB/C9K2xiq6Rxz5zGn4zsFaq3Dafai</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://130-229-19-83-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/bauta.umdc.umu.se.xml b/nya-workshop/bauta.umdc.umu.se.xml
deleted file mode 100644
index 77d2d2f5..00000000
--- a/nya-workshop/bauta.umdc.umu.se.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bauta.umdc.umu.se/simplesaml/shib13/sp/metadata.php">
-  <SPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bauta.umdc.umu.se/simplesaml/shib13/sp/AssertionConsumerService.php"/>
-  </SPSSODescriptor>
-  <ContactPerson contactType="technical">
-    <GivenName>Einar</GivenName>
-    <SurName>Hillbom</SurName>
-    <EmailAddress>einar.hillbom@umdac.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/nya-workshop/beskes.hgo.se.xml b/nya-workshop/beskes.hgo.se.xml
deleted file mode 100644
index a1c8b0dc..00000000
--- a/nya-workshop/beskes.hgo.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beskes.hgo.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://193.11.12.232/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>beskes.hgo.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=beskes.hgo.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJANHhSkT2Hi4AMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDWJlc2tlcy5oZ28uc2UwHhcNMDkwNDIxMDkyMjM2WhcNMTkwNDE5MDkyMjM2WjAYMRYwFAYDVQQDEw1iZXNrZXMuaGdvLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoNC3Yfv76OIIyf85JlKsbKctc1tR+xx2VRMxMREGMXaM3VtdW7rCvTTAS2KsFZ2KhbRwsq131KYSn9zVjqyr/E3JRlOZvZnxTSWqMh9JRREe85zap8X47GoQPjKcHxZJhLRvJinXC4tqcLFN+ndAPVJgC9MFoALwhxvUFltvDM/ykXnF1/FWmX/duLUciY0ufx54u1jN5Of9fm9cKh1VybP2ZP9HBQ/Ai2R/vP1+6fmLkczUW1AASNyiCRsXFcELEoX4C5YEPDsnutrbuXGcHIo+Gul47qq0BqBFQuUzNmBUCUaPTIempuP++OV8HlCjz5D0bUdvm8uHAD/VmCMRBQIDAQABo0owSDAnBgNVHREEIDAegg1iZXNrZXMuaGdvLnNlhg1iZXNrZXMuaGdvLnNlMB0GA1UdDgQWBBRYDVhy19PoYzkCPv/qdgJ298HK9TANBgkqhkiG9w0BAQUFAAOCAQEAPmsvXqxvTzis5MnZuGCIWKBigvPyVTlf2KJ+1oUTHlbuthe8kKhmddI49AXl/2bZGOyMwb+cX/VlVdB6QYDRKv7NuiVJG60vLSo8w7yLMqZUZOziz3JGIQGxrRLJTLQRw1R9+sZmMI6HstMZT+fsfrZQ6S8qI+yMEPX+aFQYQ3u4D4u0spahlFXi35T/vXThkitel/ZvQ7ayAVDMLC4SJkRuuinRI+TrPAJ1DIf0Q71Wuu81cNJavEZ9aNDLIBZ9PhfzcL+nvlgZUr3yI7SVnBbHc4Y0wAjncUhxaRI4XSSBfYDCHAuw9bVPhBHU0yzgAk3THZOpGnHG9TO1UdLA5Q==</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>beskes.hgo.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=beskes.hgo.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJANHhSkT2Hi4AMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDWJlc2tlcy5oZ28uc2UwHhcNMDkwNDIxMDkyMjM2WhcNMTkwNDE5MDkyMjM2WjAYMRYwFAYDVQQDEw1iZXNrZXMuaGdvLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoNC3Yfv76OIIyf85JlKsbKctc1tR+xx2VRMxMREGMXaM3VtdW7rCvTTAS2KsFZ2KhbRwsq131KYSn9zVjqyr/E3JRlOZvZnxTSWqMh9JRREe85zap8X47GoQPjKcHxZJhLRvJinXC4tqcLFN+ndAPVJgC9MFoALwhxvUFltvDM/ykXnF1/FWmX/duLUciY0ufx54u1jN5Of9fm9cKh1VybP2ZP9HBQ/Ai2R/vP1+6fmLkczUW1AASNyiCRsXFcELEoX4C5YEPDsnutrbuXGcHIo+Gul47qq0BqBFQuUzNmBUCUaPTIempuP++OV8HlCjz5D0bUdvm8uHAD/VmCMRBQIDAQABo0owSDAnBgNVHREEIDAegg1iZXNrZXMuaGdvLnNlhg1iZXNrZXMuaGdvLnNlMB0GA1UdDgQWBBRYDVhy19PoYzkCPv/qdgJ298HK9TANBgkqhkiG9w0BAQUFAAOCAQEAPmsvXqxvTzis5MnZuGCIWKBigvPyVTlf2KJ+1oUTHlbuthe8kKhmddI49AXl/2bZGOyMwb+cX/VlVdB6QYDRKv7NuiVJG60vLSo8w7yLMqZUZOziz3JGIQGxrRLJTLQRw1R9+sZmMI6HstMZT+fsfrZQ6S8qI+yMEPX+aFQYQ3u4D4u0spahlFXi35T/vXThkitel/ZvQ7ayAVDMLC4SJkRuuinRI+TrPAJ1DIf0Q71Wuu81cNJavEZ9aNDLIBZ9PhfzcL+nvlgZUr3yI7SVnBbHc4Y0wAjncUhxaRI4XSSBfYDCHAuw9bVPhBHU0yzgAk3THZOpGnHG9TO1UdLA5Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://193.11.12.232/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://193.11.12.232/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://193.11.12.232/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://193.11.12.232/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://193.11.12.232/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://193.11.12.232/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://193.11.12.232/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://193.11.12.232/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://193.11.12.232/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://193.11.12.232/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://193.11.12.232/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://193.11.12.232/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://193.11.12.232/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://193.11.12.232/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/dhcp-vg33152083.gf.gu.se.xml b/nya-workshop/dhcp-vg33152083.gf.gu.se.xml
deleted file mode 100644
index e29d8325..00000000
--- a/nya-workshop/dhcp-vg33152083.gf.gu.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dhcp-vg33152083.gf.gu.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pablo.adm.gu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pablo.adm.gu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBTCCAe2gAwIBAgIJAK/MIN9fyQOcMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3BhYmxvLmFkbS5ndS5zZTAeFw0wOTA0MjExMjU4MTVaFw0xOTA0MTkxMjU4MTVaMBoxGDAWBgNVBAMTD3BhYmxvLmFkbS5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgObyACzCQ/5cc49j6j4QAuuD4hL9C7NvaRNcgEWbZNZjVeeR3iN11WtPI2w9W9pykMfTXRKNhGZEnDj6CPxUdAgVsHYY+e2TfGaJ1PXgOU6t3RdfFiq1qfLCVIeygLrmQb8R2Jfqj9BWefmBr4dI9vO3XaFUe1D8KDq9jNuaX8/3MTv2mAKyrf6E6+u3gKld+yi0NFZA+s9Dyia/M/eKlkMuWgEePiwgUTDXo/hEBr7TF4dZFPveRJOuPsQQqKb3VzZorb53hjMeNXmeDh21fxGRp2MBoABSzXrl2695g5EwftQsxWV3AWhNG6OghzqZsJx2utb1XQ9oTTABLYyLcCAwEAAaNOMEwwKwYDVR0RBCQwIoIPcGFibG8uYWRtLmd1LnNlhg9wYWJsby5hZG0uZ3Uuc2UwHQYDVR0OBBYEFPx3suqi8w1ZGCky2o8nTcZ3NozXMA0GCSqGSIb3DQEBBQUAA4IBAQASvg179bY+dVIA3UM4Oy1DjBzFh+0BESob2CsGNEhJeJdc6YvQmuN9dLJreb1iaqej2oXF7aWYuWKLG/LdyS0Gb9cZqDYwIpdeffyPJlbihbPI+82Sy49t4C+7SnN7SVSicZjFgyjw2Oy2pLtfEvhgboC7MF45Ry0mV5pPKKfki2OsAegAHZ5IAk8HgPvkan2RrcfLieJlj6mZM1eOkOzlra1wMwzA/xXyFyhuBUQaVLDWGgB2kg46nfHTgT2d2/UoTQBy3/Khl9S3ffAr72atmde74ykQ/l8bN20aMZq0ZLSfP7lNvCxMuXUZ7yQhD1ITQu9yS5HIt25xJhXj1Dtt</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>pablo.adm.gu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pablo.adm.gu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBTCCAe2gAwIBAgIJAK/MIN9fyQOcMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3BhYmxvLmFkbS5ndS5zZTAeFw0wOTA0MjExMjU4MTVaFw0xOTA0MTkxMjU4MTVaMBoxGDAWBgNVBAMTD3BhYmxvLmFkbS5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgObyACzCQ/5cc49j6j4QAuuD4hL9C7NvaRNcgEWbZNZjVeeR3iN11WtPI2w9W9pykMfTXRKNhGZEnDj6CPxUdAgVsHYY+e2TfGaJ1PXgOU6t3RdfFiq1qfLCVIeygLrmQb8R2Jfqj9BWefmBr4dI9vO3XaFUe1D8KDq9jNuaX8/3MTv2mAKyrf6E6+u3gKld+yi0NFZA+s9Dyia/M/eKlkMuWgEePiwgUTDXo/hEBr7TF4dZFPveRJOuPsQQqKb3VzZorb53hjMeNXmeDh21fxGRp2MBoABSzXrl2695g5EwftQsxWV3AWhNG6OghzqZsJx2utb1XQ9oTTABLYyLcCAwEAAaNOMEwwKwYDVR0RBCQwIoIPcGFibG8uYWRtLmd1LnNlhg9wYWJsby5hZG0uZ3Uuc2UwHQYDVR0OBBYEFPx3suqi8w1ZGCky2o8nTcZ3NozXMA0GCSqGSIb3DQEBBQUAA4IBAQASvg179bY+dVIA3UM4Oy1DjBzFh+0BESob2CsGNEhJeJdc6YvQmuN9dLJreb1iaqej2oXF7aWYuWKLG/LdyS0Gb9cZqDYwIpdeffyPJlbihbPI+82Sy49t4C+7SnN7SVSicZjFgyjw2Oy2pLtfEvhgboC7MF45Ry0mV5pPKKfki2OsAegAHZ5IAk8HgPvkan2RrcfLieJlj6mZM1eOkOzlra1wMwzA/xXyFyhuBUQaVLDWGgB2kg46nfHTgT2d2/UoTQBy3/Khl9S3ffAr72atmde74ykQ/l8bN20aMZq0ZLSfP7lNvCxMuXUZ7yQhD1ITQu9yS5HIt25xJhXj1Dtt</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dhcp-vg33152083.gf.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/login-dev.du.se.xml b/nya-workshop/login-dev.du.se.xml
deleted file mode 100644
index 5146b42a..00000000
--- a/nya-workshop/login-dev.du.se.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login-dev.du.se/simplesamlphp">
-  <SPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login-dev.du.se/simplesamlphp/www/shib13/sp/AssertionConsumerService.php"/>
-  </SPSSODescriptor>
-  <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>na@example.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/nya-workshop/pcd559.it.hik.se.xml b/nya-workshop/pcd559.it.hik.se.xml
deleted file mode 100644
index 0495fb92..00000000
--- a/nya-workshop/pcd559.it.hik.se.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pcd559.it.hik.se/AccountCheckOut/LoginNyA">
-
-  <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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pcd559.it.hik.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pcd559.it.hik.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAJ3BsY6pQZ90MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHBjZDU1OS5pdC5oaWsuc2UwHhcNMDkwNDI5MjAwNTQyWhcNMTkwNDI3MjAw
-NTQyWjAbMRkwFwYDVQQDExBwY2Q1NTkuaXQuaGlrLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqzHFRQ+/CN1T5gY8573emoW39HbbMLg8pqq7W6ey
-KrjfckS63ufWgbFd+1r9v1zKgfA96Z0x5hPFf+kktQ9idwf8qtiwS+By7v+cxbiJ
-ryiq6D1NWqIkQ4eYMusIUTxfRiG2NcyzCYy+WtZ5xX9S82YwFlnHQKmSifQJm/IS
-Gp3Z5R48mk15S+SzoosPVguVULHiU9AakJqhoOJC5TnRxyz7wWqxq6L4UPhjBkEI
-fez/wSmaq0A+nmKfcB7w4osGA2mb0d5/vM3xcuztInTymHtN4i8oO1Wbh90Vlatq
-SVe8GL8DeAEztrj4o93fgfbo4702R5XVC3ZKb4zOch3kNwIDAQABoz4wPDAbBgNV
-HREEFDASghBwY2Q1NTkuaXQuaGlrLnNlMB0GA1UdDgQWBBQ221FmY+XZv8yysawE
-peJQF+ScuTANBgkqhkiG9w0BAQUFAAOCAQEABx/iqkFBf0oMDd2aBap4OM51A9BO
-amTRQQnC7qyJtlvwmtU943iRgBnd0ao6+6XkKcy4qyi5FxxHtNR0caLl+fa62F5z
-z/nIFAXmbnDBY13JMUXinHIVYtL8FyuRrY3iwAvaSBzRFA2udsDmI4fpMJr32vI7
-03WpkMs9CSd6Htpt5BwUhIGWanC5zx8xzSecr42pJ/hdQf3KWKhVOS5BdW/TsfJn
-UqSyjzgNrZQAP7BGk3BgbaRmz1QwUiNWQyv1lUChn4Ddcesgmti1IZvPK35d5P4L
-GEKggh9iWSQrtbMjxvjqqvTlaS+FtO/uatJJcTGPfxy9KgzTCLyC3aVKPQ==
-</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>pcd559.it.hik.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pcd559.it.hik.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAJ3BsY6pQZ90MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHBjZDU1OS5pdC5oaWsuc2UwHhcNMDkwNDI5MjAwNTQyWhcNMTkwNDI3MjAw
-NTQyWjAbMRkwFwYDVQQDExBwY2Q1NTkuaXQuaGlrLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqzHFRQ+/CN1T5gY8573emoW39HbbMLg8pqq7W6ey
-KrjfckS63ufWgbFd+1r9v1zKgfA96Z0x5hPFf+kktQ9idwf8qtiwS+By7v+cxbiJ
-ryiq6D1NWqIkQ4eYMusIUTxfRiG2NcyzCYy+WtZ5xX9S82YwFlnHQKmSifQJm/IS
-Gp3Z5R48mk15S+SzoosPVguVULHiU9AakJqhoOJC5TnRxyz7wWqxq6L4UPhjBkEI
-fez/wSmaq0A+nmKfcB7w4osGA2mb0d5/vM3xcuztInTymHtN4i8oO1Wbh90Vlatq
-SVe8GL8DeAEztrj4o93fgfbo4702R5XVC3ZKb4zOch3kNwIDAQABoz4wPDAbBgNV
-HREEFDASghBwY2Q1NTkuaXQuaGlrLnNlMB0GA1UdDgQWBBQ221FmY+XZv8yysawE
-peJQF+ScuTANBgkqhkiG9w0BAQUFAAOCAQEABx/iqkFBf0oMDd2aBap4OM51A9BO
-amTRQQnC7qyJtlvwmtU943iRgBnd0ao6+6XkKcy4qyi5FxxHtNR0caLl+fa62F5z
-z/nIFAXmbnDBY13JMUXinHIVYtL8FyuRrY3iwAvaSBzRFA2udsDmI4fpMJr32vI7
-03WpkMs9CSd6Htpt5BwUhIGWanC5zx8xzSecr42pJ/hdQf3KWKhVOS5BdW/TsfJn
-UqSyjzgNrZQAP7BGk3BgbaRmz1QwUiNWQyv1lUChn4Ddcesgmti1IZvPK35d5P4L
-GEKggh9iWSQrtbMjxvjqqvTlaS+FtO/uatJJcTGPfxy9KgzTCLyC3aVKPQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pcd559.it.hik.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pcd559.it.hik.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pcd559.it.hik.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pcd559.it.hik.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pcd559.it.hik.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pcd559.it.hik.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pcd559.it.hik.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pcd559.it.hik.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pcd559.it.hik.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pcd559.it.hik.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pcd559.it.hik.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pcd559.it.hik.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pcd559.it.hik.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pcd559.it.hik.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
-\ No newline at end of file
diff --git a/nya-workshop/shibbnya.hh.se.xml b/nya-workshop/shibbnya.hh.se.xml
deleted file mode 100644
index 0acf5e72..00000000
--- a/nya-workshop/shibbnya.hh.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbnya.hh.se">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibbnya.hh.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibbnya.hh.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibbnya.hh.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDATCCAemgAwIBAgIJAINldb3qz04KMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDnNoaWJibnlhLmhoLnNlMB4XDTA5MDQyMTA5MDE0OVoXDTE5MDQxOTA5MDE0OVowGTEXMBUGA1UEAxMOc2hpYmJueWEuaGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWwgFXmI7BhmHuxgzRldCjD/GeY+kWbASiOefRX8lQIuj1gw9pVvT6DgZNtAQTxRsWY9OPP74zdOeamIPbWSWKtAqqnyWVS6w0+u1/x1LCh9MP8ycQNCM3+OdUG0LYGGzglsmdwRmVtX4/hSADoae05KUihX8jpuXmQvw9oczlAwtUbdESUoV9N5/NPanWx5z/2apB75f1A2UQaRoklg0BYNTXw9DiHiMNsLWvupzYdnaywb747WLgiHuyaE7kxsxn02UvqJgvn9juJm3d6hDn1Ghjhgw2CsrtLXt4b9/8Dsa4RXYBKYHakQ+Rj0E1+oVUiPze2rTvdQ8RVsMFxt05AgMBAAGjTDBKMCkGA1UdEQQiMCCCDnNoaWJibnlhLmhoLnNlhg5zaGliYm55YS5oaC5zZTAdBgNVHQ4EFgQUWf7TO2J9EJRhwBW6/d+w0jMACm8wDQYJKoZIhvcNAQEFBQADggEBAJKjY34xJy1ZhZslTWwQhUKL+odSyUvfLdUp7AS8lrAVJ+IiQhOBFz12QVfXzO7zl03xFfI6Pc4yvYEtewq40PlV0FJFAZM4NAzev3Xit8UZKHergXhvgFHHSt84lTzfBtWmrmWddRP5+/mi4Ecp5A5kwSGiwDMmCGO8ULFf8lVOsrllaW9hFwIUrBu7geyKDj10sNbnteXvvTmI6X3WfuWAdBq1ufeEMV7gTZna5E9Fwr2L9HD0/ThuBEPf8OB0FtePGIax8eCh8W5lEy+X6zagvYauIVMzLQBD3eeBge04jBMFD8xtpBe/kAboIbJeaj5owZAnDuLt3mg9iSQx6nA=</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>shibbnya.hh.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibbnya.hh.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDATCCAemgAwIBAgIJAINldb3qz04KMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDnNoaWJibnlhLmhoLnNlMB4XDTA5MDQyMTA5MDE0OVoXDTE5MDQxOTA5MDE0OVowGTEXMBUGA1UEAxMOc2hpYmJueWEuaGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWwgFXmI7BhmHuxgzRldCjD/GeY+kWbASiOefRX8lQIuj1gw9pVvT6DgZNtAQTxRsWY9OPP74zdOeamIPbWSWKtAqqnyWVS6w0+u1/x1LCh9MP8ycQNCM3+OdUG0LYGGzglsmdwRmVtX4/hSADoae05KUihX8jpuXmQvw9oczlAwtUbdESUoV9N5/NPanWx5z/2apB75f1A2UQaRoklg0BYNTXw9DiHiMNsLWvupzYdnaywb747WLgiHuyaE7kxsxn02UvqJgvn9juJm3d6hDn1Ghjhgw2CsrtLXt4b9/8Dsa4RXYBKYHakQ+Rj0E1+oVUiPze2rTvdQ8RVsMFxt05AgMBAAGjTDBKMCkGA1UdEQQiMCCCDnNoaWJibnlhLmhoLnNlhg5zaGliYm55YS5oaC5zZTAdBgNVHQ4EFgQUWf7TO2J9EJRhwBW6/d+w0jMACm8wDQYJKoZIhvcNAQEFBQADggEBAJKjY34xJy1ZhZslTWwQhUKL+odSyUvfLdUp7AS8lrAVJ+IiQhOBFz12QVfXzO7zl03xFfI6Pc4yvYEtewq40PlV0FJFAZM4NAzev3Xit8UZKHergXhvgFHHSt84lTzfBtWmrmWddRP5+/mi4Ecp5A5kwSGiwDMmCGO8ULFf8lVOsrllaW9hFwIUrBu7geyKDj10sNbnteXvvTmI6X3WfuWAdBq1ufeEMV7gTZna5E9Fwr2L9HD0/ThuBEPf8OB0FtePGIax8eCh8W5lEy+X6zagvYauIVMzLQBD3eeBge04jBMFD8xtpBe/kAboIbJeaj5owZAnDuLt3mg9iSQx6nA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbnya.hh.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbnya.hh.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbnya.hh.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbnya.hh.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbnya.hh.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbnya.hh.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbnya.hh.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbnya.hh.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbnya.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbnya.hh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbnya.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbnya.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbnya.hh.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbnya.hh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/shibtest.hb.se.xml b/nya-workshop/shibtest.hb.se.xml
deleted file mode 100644
index 0d687dce..00000000
--- a/nya-workshop/shibtest.hb.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibtest.hb.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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibtest.hb.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibtest.hb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibtest.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDATCCAemgAwIBAgIJAM6A8T94hYqsMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDnNoaWJ0ZXN0LmhiLnNlMB4XDTA5MDQyMTA5MzIyOFoXDTE5MDQxOTA5MzIyOFowGTEXMBUGA1UEAxMOc2hpYnRlc3QuaGIuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0QSFVCZV0QTAqhn+VAVsVMZuS3S4nbuFS4g4ATzggc168K92G5x8ZjuQrwBhi0IUCSKD4DSPTpcsxFqwKQeYySWaAsVNONfg443Klf/XDiXMzayAn/wyV8V2VS/atGsOWbWWrDEGPs4Qt5VfxFFQA17wKn2Jq6ZzsfwTd7bus79Zybwk21SlEyitij59NyB66F2Pk0R9EBA0BfM09ajW8YVJaLEtj10wueL5HE+p7wDifmBkXxAhgjFPcNdy+w8jzQiVWO1S6SrxOFwuVSSzdahHwb8VhyufnCg2UwjOygeiiemvVEK0F5zgtJGg9C5adpzl8PTov+hsA3cx/R3o5AgMBAAGjTDBKMCkGA1UdEQQiMCCCDnNoaWJ0ZXN0LmhiLnNlhg5zaGlidGVzdC5oYi5zZTAdBgNVHQ4EFgQUteU30UPvwe+om8ECS3NUECLij5MwDQYJKoZIhvcNAQEFBQADggEBAFYg9Hsjr8u0ZCff8Ia6ClXwTbEKdQLgErsCKwo00s174s8FYZ10pZq3CK92BlMODVSe3ThwIXWuYXk3/VChd4p4UkhzjjpU2vafzYtQ0IbJJCR3mtSF+U2+AmeMIay5YtRsD3OdVofD6JFzEoCH1MXzJllY1Wx+2HL/Zg/3wYMGAda3k784yqNdxm0ij2K5vEibq8JlPFEQtSd6Se77KoBTz8YGYSAGwTED+UdcJda9+z3QtY+fKlrSS/QqtN02tHYnRVnam1l+pLucqSNVDusZKS0i/8gVwFomOl7VrqIGuN0hfa6jOXPKR6FnHKk/VD2gEnkBDK3nQtg7WAhRH20=</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>shibtest.hb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibtest.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDATCCAemgAwIBAgIJAM6A8T94hYqsMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDnNoaWJ0ZXN0LmhiLnNlMB4XDTA5MDQyMTA5MzIyOFoXDTE5MDQxOTA5MzIyOFowGTEXMBUGA1UEAxMOc2hpYnRlc3QuaGIuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0QSFVCZV0QTAqhn+VAVsVMZuS3S4nbuFS4g4ATzggc168K92G5x8ZjuQrwBhi0IUCSKD4DSPTpcsxFqwKQeYySWaAsVNONfg443Klf/XDiXMzayAn/wyV8V2VS/atGsOWbWWrDEGPs4Qt5VfxFFQA17wKn2Jq6ZzsfwTd7bus79Zybwk21SlEyitij59NyB66F2Pk0R9EBA0BfM09ajW8YVJaLEtj10wueL5HE+p7wDifmBkXxAhgjFPcNdy+w8jzQiVWO1S6SrxOFwuVSSzdahHwb8VhyufnCg2UwjOygeiiemvVEK0F5zgtJGg9C5adpzl8PTov+hsA3cx/R3o5AgMBAAGjTDBKMCkGA1UdEQQiMCCCDnNoaWJ0ZXN0LmhiLnNlhg5zaGlidGVzdC5oYi5zZTAdBgNVHQ4EFgQUteU30UPvwe+om8ECS3NUECLij5MwDQYJKoZIhvcNAQEFBQADggEBAFYg9Hsjr8u0ZCff8Ia6ClXwTbEKdQLgErsCKwo00s174s8FYZ10pZq3CK92BlMODVSe3ThwIXWuYXk3/VChd4p4UkhzjjpU2vafzYtQ0IbJJCR3mtSF+U2+AmeMIay5YtRsD3OdVofD6JFzEoCH1MXzJllY1Wx+2HL/Zg/3wYMGAda3k784yqNdxm0ij2K5vEibq8JlPFEQtSd6Se77KoBTz8YGYSAGwTED+UdcJda9+z3QtY+fKlrSS/QqtN02tHYnRVnam1l+pLucqSNVDusZKS0i/8gVwFomOl7VrqIGuN0hfa6jOXPKR6FnHKk/VD2gEnkBDK3nQtg7WAhRH20=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.hb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.hb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.hb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.hb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.hb.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.hb.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.hb.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.hb.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.hb.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.hb.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.hb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/nya-workshop/swamid.wayf.ruc.dk.xml b/nya-workshop/swamid.wayf.ruc.dk.xml
deleted file mode 100644
index 87764f26..00000000
--- a/nya-workshop/swamid.wayf.ruc.dk.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.wayf.ruc.dk/swamid">
-  <SPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swamid.wayf.ruc.dk/swamid/shib13/sp/AssertionConsumerService.php"/>
-  </SPSSODescriptor>
-  <ContactPerson contactType="technical">
-    <GivenName>Mads</GivenName>
-    <SurName>Freek</SurName>
-    <EmailAddress>freek@ruc.dk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/nya-workshop/users.hv.se.xml b/nya-workshop/users.hv.se.xml
deleted file mode 100644
index 0ee1cac6..00000000
--- a/nya-workshop/users.hv.se.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://users.hv.se/login/shib13/sp/metadata.php">
-  <SPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://users.hv.se/login/shib13/sp/AssertionConsumerService.php"/>
-  </SPSSODescriptor>
-  <ContactPerson contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Andersson</SurName>
-    <EmailAddress>magnus.andersson@hv.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/nya-workshop/vm-shibb-03.hig.se.xml b/nya-workshop/vm-shibb-03.hig.se.xml
deleted file mode 100644
index 5f15869c..00000000
--- a/nya-workshop/vm-shibb-03.hig.se.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vm-shibb-03.hig.se">
-
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vm-shibb-03.hig.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vm-shibb-03.hig.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAMPsse/uymyzMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnZtLXNoaWJiLTAzLmhpZy5zZTAeFw0wOTA0MjEwODUzMjVaFw0xOTA0MTkw
-ODUzMjVaMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALkIlu3cZmAeO7rDkhnqy3KIXKHT0rybuGwS
-F9H2Fimtk2qO/w10PPVYOy1aseHJtNShuDBDeLlosIGwO9bOMBU8mpEmVh9Npibr
-Bfm/mLzu2zhlJnx6bvbei0W8bkdHHYz/0wsARqbh5lHwRRoUh5kD+edtIPBEKnNt
-BmXy7TE1gOFfrYXXZUelXYrS9w/uJ1B2tDS5UzCWG2dXGWXxfDOOkdOd/X6tkT6B
-1DN6i9eEJ1jzTIpGVv5JfYZaxTjUVwpQjEsjo4QnYXOmqaN/CZwPeTdHorVzjxpw
-pxa/dLLWsUe2NcpzDQ10ptMZXHY0S6ohFGrhpaSh8EXKS/yj1p0CAwEAAaNUMFIw
-MQYDVR0RBCowKIISdm0tc2hpYmItMDMuaGlnLnNlhhJ2bS1zaGliYi0wMy5oaWcu
-c2UwHQYDVR0OBBYEFPkCYHeh+f8+8SRHVpqxdzvvbCxkMA0GCSqGSIb3DQEBBQUA
-A4IBAQBC+48YO32cmDwgt0MpPIeywBwwSbTDGKaCffiWzQhex/jUWRJgBy+cfRmB
-pdXp/P0CML8sjW3LjBbOcFLpnMeYdE4ITOE+4S9R78BOCcW/4FU4qlCbaLrMG098
-sJOkzDf23yb7BInk+gk+8FCSXmfjmuKM4kawQFvuXtVilq4XWqixYCEmqcfxZKp2
-X2o5PFotqMRsMX7X0q3IBK8+IIB/1lrlGXdB/mrBzo8C/+gjevgpFSylQSDDsQEU
-j65ahYmwTjD1U6F+m87/WWCG8QqXp7cvg2HmTzPe6QNkXs7gauhn+12ceXw4Jfh2
-z5xj6a9Suh7voH5GnGWs7KIjRbrq
-</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>vm-shibb-03.hig.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vm-shibb-03.hig.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAMPsse/uymyzMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnZtLXNoaWJiLTAzLmhpZy5zZTAeFw0wOTA0MjEwODUzMjVaFw0xOTA0MTkw
-ODUzMjVaMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALkIlu3cZmAeO7rDkhnqy3KIXKHT0rybuGwS
-F9H2Fimtk2qO/w10PPVYOy1aseHJtNShuDBDeLlosIGwO9bOMBU8mpEmVh9Npibr
-Bfm/mLzu2zhlJnx6bvbei0W8bkdHHYz/0wsARqbh5lHwRRoUh5kD+edtIPBEKnNt
-BmXy7TE1gOFfrYXXZUelXYrS9w/uJ1B2tDS5UzCWG2dXGWXxfDOOkdOd/X6tkT6B
-1DN6i9eEJ1jzTIpGVv5JfYZaxTjUVwpQjEsjo4QnYXOmqaN/CZwPeTdHorVzjxpw
-pxa/dLLWsUe2NcpzDQ10ptMZXHY0S6ohFGrhpaSh8EXKS/yj1p0CAwEAAaNUMFIw
-MQYDVR0RBCowKIISdm0tc2hpYmItMDMuaGlnLnNlhhJ2bS1zaGliYi0wMy5oaWcu
-c2UwHQYDVR0OBBYEFPkCYHeh+f8+8SRHVpqxdzvvbCxkMA0GCSqGSIb3DQEBBQUA
-A4IBAQBC+48YO32cmDwgt0MpPIeywBwwSbTDGKaCffiWzQhex/jUWRJgBy+cfRmB
-pdXp/P0CML8sjW3LjBbOcFLpnMeYdE4ITOE+4S9R78BOCcW/4FU4qlCbaLrMG098
-sJOkzDf23yb7BInk+gk+8FCSXmfjmuKM4kawQFvuXtVilq4XWqixYCEmqcfxZKp2
-X2o5PFotqMRsMX7X0q3IBK8+IIB/1lrlGXdB/mrBzo8C/+gjevgpFSylQSDDsQEU
-j65ahYmwTjD1U6F+m87/WWCG8QqXp7cvg2HmTzPe6QNkXs7gauhn+12ceXw4Jfh2
-z5xj6a9Suh7voH5GnGWs7KIjRbrq
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
-\ No newline at end of file
diff --git a/nya-workshop/vmtest005.ita.chalmers.se.xml b/nya-workshop/vmtest005.ita.chalmers.se.xml
deleted file mode 100644
index 66d6ae44..00000000
--- a/nya-workshop/vmtest005.ita.chalmers.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vmtest005.ita.chalmers.se/">
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vmtest005.ita.chalmers.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vmtest005.ita.chalmers.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIJAP1Tf7aP3Uo/MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXZtdGVzdDAwNS5pdGEuY2hhbG1lcnMuc2UwHhcNMDkwNDIxMTMyMzU2WhcNMTkwNDE5MTMyMzU2WjAkMSIwIAYDVQQDExl2bXRlc3QwMDUuaXRhLmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs+3I8rHAwiHBP3kwQcM8kZrwI/+RuyZgtZp7DOWDGfyYj+7K1VjVMhFXFhXPk2KamZjM30tKtqeMDjBDE0XxqSOtolXMYjopN9lShOxyoEEaK/k7R427NB7T/1UujRAXRdHls8cnIkqZLH4ljU5EfZD1mGEG5i6PvsHU+4pkrEg+O04C+YwgHTdsS464IbuoiqE+9AdcAZQNRkzU1vieUQJSNTv1b8M9bZdBqJncEJYBqKV8JBLVQEWUEffoDZU7Xq8nxkdbModRZaC8/4ewuy9R7hfrxxPET4iGNSM/WO5u/9QYre+zzxfuZF84NnIOe3bVdmiBe9bAJZOpGv/8yQIDAQABo2IwYDA/BgNVHREEODA2ghl2bXRlc3QwMDUuaXRhLmNoYWxtZXJzLnNlhhl2bXRlc3QwMDUuaXRhLmNoYWxtZXJzLnNlMB0GA1UdDgQWBBToU3ZpQQWoeeoRBlLxWP0EV9J1TzANBgkqhkiG9w0BAQUFAAOCAQEAbgucn3CyFl52WlBt7Dt2kW50tiFIlkMjCmJhG1DY4jzhehOJeSQNQ5qseBdrcvG9EWM/RclTBDcEysykdqogBV+0FDFhl4W9Wms3Bw3U9Yjn36zfvxh59nERiFmvpSXNxFuodreE2b0DHkkEEcXzvsgvACs5yIiT3Tpn8s3zlWxtF8WXSKlOHCYhJx8bURYxCUgElHLc7XX+/Lckm2bkufC+JNaK2+8DodJxYizezpdqQkEXiGnVId3yZnFVbmiooY6rYzG/rBCRHbXby2TJKg2SCK1TszO9YUocUgODQ9SERUsYNB/3XpjEl4D0FBPKHn3NiuQ8YMgf3VNU/UqqIg==</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>vmtest005.ita.chalmers.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vmtest005.ita.chalmers.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIJAP1Tf7aP3Uo/MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXZtdGVzdDAwNS5pdGEuY2hhbG1lcnMuc2UwHhcNMDkwNDIxMTMyMzU2WhcNMTkwNDE5MTMyMzU2WjAkMSIwIAYDVQQDExl2bXRlc3QwMDUuaXRhLmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs+3I8rHAwiHBP3kwQcM8kZrwI/+RuyZgtZp7DOWDGfyYj+7K1VjVMhFXFhXPk2KamZjM30tKtqeMDjBDE0XxqSOtolXMYjopN9lShOxyoEEaK/k7R427NB7T/1UujRAXRdHls8cnIkqZLH4ljU5EfZD1mGEG5i6PvsHU+4pkrEg+O04C+YwgHTdsS464IbuoiqE+9AdcAZQNRkzU1vieUQJSNTv1b8M9bZdBqJncEJYBqKV8JBLVQEWUEffoDZU7Xq8nxkdbModRZaC8/4ewuy9R7hfrxxPET4iGNSM/WO5u/9QYre+zzxfuZF84NnIOe3bVdmiBe9bAJZOpGv/8yQIDAQABo2IwYDA/BgNVHREEODA2ghl2bXRlc3QwMDUuaXRhLmNoYWxtZXJzLnNlhhl2bXRlc3QwMDUuaXRhLmNoYWxtZXJzLnNlMB0GA1UdDgQWBBToU3ZpQQWoeeoRBlLxWP0EV9J1TzANBgkqhkiG9w0BAQUFAAOCAQEAbgucn3CyFl52WlBt7Dt2kW50tiFIlkMjCmJhG1DY4jzhehOJeSQNQ5qseBdrcvG9EWM/RclTBDcEysykdqogBV+0FDFhl4W9Wms3Bw3U9Yjn36zfvxh59nERiFmvpSXNxFuodreE2b0DHkkEEcXzvsgvACs5yIiT3Tpn8s3zlWxtF8WXSKlOHCYhJx8bURYxCUgElHLc7XX+/Lckm2bkufC+JNaK2+8DodJxYizezpdqQkEXiGnVId3yZnFVbmiooY6rYzG/rBCRHbXby2TJKg2SCK1TszO9YUocUgODQ9SERUsYNB/3XpjEl4D0FBPKHn3NiuQ8YMgf3VNU/UqqIg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vmtest005.ita.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2012-05-10 09:26:57 +0200
committer	Leif Johansson <leifj@sunet.se>	2012-05-10 09:26:57 +0200
commit	848167c77893048e14305c935d13cd5ac42aaf16 (patch)
tree	afba72d7a565659f282f9279ce9bcd66d1d66a30
parent	52e7964e02daefe0813441abb0f782e4128d7930 (diff)