resolves SWAMIDOPS-6287

11 files changed, 0 insertions, 386 deletions

diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index c930e7c3..ba62474d 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/nya-1.0.xml">
-  <xi:include href="swamid-1.0/sp1.lab.it.su.se.xml"/>
   <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
   <xi:include href="swamid-1.0/shib-sp.kau.se.xml"/>
   <xi:include href="swamid-1.0/public.it.secure.su.se.xml"/>
diff --git a/nya-1.0.mxml b/nya-1.0.mxml
index 72ddd37b..cde417d2 100644
--- a/nya-1.0.mxml
+++ b/nya-1.0.mxml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/nya-1.0.xml">
-  <xi:include href="swamid-1.0/sp1.lab.it.su.se.xml"/>
   <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
   <xi:include href="swamid-1.0/shib-sp.kau.se.xml"/>
   <xi:include href="swamid-1.0/public.it.secure.su.se.xml"/>
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index d29969cc..783fda2a 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -14,20 +14,15 @@
   <xi:include href="swamid-1.0/pp-komm-admin.it.su.se.xml"/>
   <xi:include href="swamid-1.0/www.sub.su.se.xml"/>
   <xi:include href="swamid-1.0/idp.protectnetwork.org.xml"/>
-  <xi:include href="swamid-1.0/lab03.lab.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/calsrv1.it.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/samsok.libris.kb.se.xml"/>
   <xi:include href="swamid-1.0/public.it.secure.su.se.xml"/>
   <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
   <xi:include href="swamid-1.0/mondo-web.it.su.se.xml"/>
   <xi:include href="swamid-1.0/idp.hig.se.xml"/>
-  <xi:include href="swamid-1.0/sp1.lab.it.su.se.xml"/>
   <xi:include href="swamid-1.0/hr-sso.pb.su.se.xml"/>
   <xi:include href="swamid-1.0/cbs-vylvatest.kib.ki.se.xml"/>
-  <xi:include href="swamid-1.0/jolu.dev.it.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/labs.swami.se.xml"/>
   <xi:include href="swamid-1.0/shibboleth.ebscohost.com.xml"/>
-  <xi:include href="swamid-1.0/callab0.it.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/www3.genuinetext.com.xml"/>
   <xi:include href="swamid-1.0/xfire.mimas.ac.uk.xml"/>
   <xi:include href="swamid-1.0/idp.secure.su.se.xml"/>
@@ -53,9 +48,6 @@
   <xi:include href="swamid-1.0/samlidp.ki.se.xml"/>
   <xi:include href="swamid-1.0/sp.wavelan.su.se.xml"/>
   <xi:include href="swamid-1.0/samadhi.kib.ki.se.xml"/>
-  <xi:include href="swamid-1.0/marcus.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/kllin.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/ilinca.it.su.se.xml"/>
   <xi:include href="swamid-1.0/idp.nordu.net.xml"/>
   <xi:include href="swamid-1.0/idp.it.gu.se.xml"/>
   <xi:include href="swamid-1.0/tcs-test.sunet.se.xml"/>
diff --git a/swamid-1.0/callab0.it.secure.su.se.xml b/swamid-1.0/callab0.it.secure.su.se.xml
deleted file mode 100644
index 4302497b..00000000
--- a/swamid-1.0/callab0.it.secure.su.se.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://callab0.it.secure.su.se">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" 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>MIIB+TCCAWKgAwIBAgIJAOlQKzLVXB5JMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJiLWNhbGxhYjAuaXQuc2VjdXJlLnN1LnNlMB4XDTA3MDMyMDEyMTMxN1oXDTA4MDMxOTEyMTMxN1owKDEmMCQGA1UEAxMdc2hpYmItY2FsbGFiMC5pdC5zZWN1cmUuc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL/+i70hIW+rIYYJ9mvNEUE1SztYa9mAZuPhH1J4li+pyvghKZQHTI3UuYpbRGEQ1/83a7MAM+6VOQmYQtZDSw8PhtJKcpd1fFhSACqpDQKgBRSwcYsQkjb52j63r3kDXT4VDosImeg0HRb+HIWo4blC8gP2sZLSKa5BHJK+87GdAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEATDf77yw3aqQYXj4XpY3bUHrrnA9zwYrkboeTCk61s7VrNTLE0T/YEM2qFBxUOWdNxBGuuP6T30XsK2vS0VW7wHTGV+6j9KF+niUQbo/VqKOO69XaO5X0WbJKdI/WyTunmWY5uECoASNhFGcBMqcINAUSktTXlsDB6ttoP1cnjMo=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://callab0.it.secure.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/calsrv1.it.secure.su.se.xml b/swamid-1.0/calsrv1.it.secure.su.se.xml
deleted file mode 100644
index dcf1df5d..00000000
--- a/swamid-1.0/calsrv1.it.secure.su.se.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://calsrv1.it.secure.su.se">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" 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>MIIB7TCCAVagAwIBAgIJALw0kc74UYP+MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2NhbHNydjEuaXQuc2VjdXJlLnN1LnNlMB4XDTA3MDUyMjA3NDA0OFoXDTA4MDUyMTA3NDA0OFowIjEgMB4GA1UEAxMXY2Fsc3J2MS5pdC5zZWN1cmUuc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKVMn+fnnV8w2GuB1KMm6gEiZqqCBrHWWUDK5SEVDy6rT2qK/VkuxyxvDPFXdd8kbpaOpqxMcy+J4QvS74xkOSKHF8ISTvX9328cU1pUe9u7Gd5C37zD5OgAUqIVq1GwvZHrSstZuoF/4LQoJJbEBquwGGd8tldflGEJtcxb7iP7AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAoFPwC0awA7gYbfZPCtUpHmly4cc8utYSgjb+rsTFGuYu5V7Ec5/o1F73vsibmRufBRyczQsX9oeNHENawKmka/0JUo1FTyTI0yN1or7LhW8mAle+80o5EVd/Xa5yP4jof+/Ey79UeLG+CuJbRiH0f9kO1e4r/fFGP60Ck76CeoU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://calsrv1.it.secure.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Mattias</GivenName>
-    <SurName>Amnefelt</SurName>
-    <EmailAddress>mattiasa@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/ilinca.it.su.se.xml b/swamid-1.0/ilinca.it.su.se.xml
deleted file mode 100644
index 76cbffda..00000000
--- a/swamid-1.0/ilinca.it.su.se.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ilinca.it.su.se/Shibboleth.sso">
-
-  <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://ilinca.it.su.se/Shibboleth.sso/WAYF" index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ilinca.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ilinca.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=ilinca.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>10988849576663837321</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAJiAPHfzP+qJMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lsaW5jYS5pdC5zdS5zZTAeFw0wOTA4MTcwODEzNDVaFw0xOTA4MTUwODEz
-NDVaMBoxGDAWBgNVBAMTD2lsaW5jYS5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOXB7HDd3xSjmS+CdKE/51gmugmfLD/rWbFl4ma/DynK
-5D7Cz//7VeSPulC9lwaKtq3SJg/f44fJBwwZpM8+H0NLkkVUtjiaj6ggaNEuvGch
-4w7KFgb6w4y2A0eSCWWj+IgNlUs3L/x3dT4A3Uu9RV9beR5KpxCgOEVzFo1d21tu
-nOsodBkDkpTxzBRizcF2yqVgWoGkEUMQw4ioHV3XtVs2C38Ax215yVhfeKkHncjL
-5SS8ecXWhgbLfw7n5KHQNCOBJsvVQE4QRTU1MmJ7uHIUk5my47Ua38X+Bozm1fqM
-UtExw+2Wg5VNiuzi08XWnwl6zgJn8qSawR9g6BR1S50CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPaWxpbmNhLml0LnN1LnNlMB0GA1UdDgQWBBQzCCAfgJgB3wR0tqIaq5W7
-4pTVzjANBgkqhkiG9w0BAQUFAAOCAQEAw1gcpFHR23LG0JMZc7ESGapG1HG3kpfS
-NyqJ84WxA1HQS3oqS4JcLcDnwpUUPiC80jECQpNBqqMSxwVuqhIuE6yd4cl1gtmC
-xP0OhvLkXtD8DxCWvvVgRM1ZeYl/rtlLVOrwy5Sd9YSktJOvqugl86qvOjsfppqE
-aNKZapqL4HCp4mA6CC9+ErC6EeMH7nglt3i/O0MR8/5fTVdlYEP6fvqExn5070hH
-bOSmcNTEUPWw0E2O73AdoqVxjLhLtOra8xlJiphHwSNXeU6H46Vx9UYG8Uh1xtal
-ZUOWiUqVuxudj0Ke7D2Qx/NqyIlx99p5Omzl0NFcJLu+RgUfuF+jgg==
-</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>ilinca.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ilinca.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=ilinca.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>10988849576663837321</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAJiAPHfzP+qJMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lsaW5jYS5pdC5zdS5zZTAeFw0wOTA4MTcwODEzNDVaFw0xOTA4MTUwODEz
-NDVaMBoxGDAWBgNVBAMTD2lsaW5jYS5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOXB7HDd3xSjmS+CdKE/51gmugmfLD/rWbFl4ma/DynK
-5D7Cz//7VeSPulC9lwaKtq3SJg/f44fJBwwZpM8+H0NLkkVUtjiaj6ggaNEuvGch
-4w7KFgb6w4y2A0eSCWWj+IgNlUs3L/x3dT4A3Uu9RV9beR5KpxCgOEVzFo1d21tu
-nOsodBkDkpTxzBRizcF2yqVgWoGkEUMQw4ioHV3XtVs2C38Ax215yVhfeKkHncjL
-5SS8ecXWhgbLfw7n5KHQNCOBJsvVQE4QRTU1MmJ7uHIUk5my47Ua38X+Bozm1fqM
-UtExw+2Wg5VNiuzi08XWnwl6zgJn8qSawR9g6BR1S50CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPaWxpbmNhLml0LnN1LnNlMB0GA1UdDgQWBBQzCCAfgJgB3wR0tqIaq5W7
-4pTVzjANBgkqhkiG9w0BAQUFAAOCAQEAw1gcpFHR23LG0JMZc7ESGapG1HG3kpfS
-NyqJ84WxA1HQS3oqS4JcLcDnwpUUPiC80jECQpNBqqMSxwVuqhIuE6yd4cl1gtmC
-xP0OhvLkXtD8DxCWvvVgRM1ZeYl/rtlLVOrwy5Sd9YSktJOvqugl86qvOjsfppqE
-aNKZapqL4HCp4mA6CC9+ErC6EeMH7nglt3i/O0MR8/5fTVdlYEP6fvqExn5070hH
-bOSmcNTEUPWw0E2O73AdoqVxjLhLtOra8xlJiphHwSNXeU6H46Vx9UYG8Uh1xtal
-ZUOWiUqVuxudj0Ke7D2Qx/NqyIlx99p5Omzl0NFcJLu+RgUfuF+jgg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilinca.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilinca.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilinca.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilinca.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilinca.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilinca.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilinca.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilinca.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilinca.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ilinca.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilinca.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ilinca.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilinca.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ilinca.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-1.0/jolu.dev.it.secure.su.se.xml b/swamid-1.0/jolu.dev.it.secure.su.se.xml
deleted file mode 100644
index 59b67bbf..00000000
--- a/swamid-1.0/jolu.dev.it.secure.su.se.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jolu.dev.it.secure.su.se/shibboleth">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" 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>MIIB7zCCAVigAwIBAgIJAJwEs4t2qiO0MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGGpvbHUuZGV2Lml0LnNlY3VyZS5zdS5zZTAeFw0wOTExMjMwODUzMTdaFw0x
-MDExMjMwODUzMTdaMCMxITAfBgNVBAMTGGpvbHUuZGV2Lml0LnNlY3VyZS5zdS5z
-ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApI03wSb2s+PQr8xdpfk6yQHI
-QjHPkvKtyOlYvLpmGMhvY22xOaQjOphM9hSaRMiZ9BzmEFAsv9Mn7idq8Y/u5CdE
-Tlv9uTiqtaJBJqgggxMBtrB40x74DCkm+VBWF0Lh0nnYuO7niVPOSJoYw8JQGWPI
-ls2Cuda0Qax0phkrrasCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsG
-AQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQCLl0YaouZ/Sw0xaOsr
-xfBp6dFzqmWvNlKV8gukVPZgjSRyb27Xa7jGsxvJXHKHVn4CSKKRHhXEzDLcWmCJ
-fsIPIaFD0DlyuQL1bhaEHVUyDFf+2uusK2jWgtM7yQGGYXtzYcouXNx6VF+niADr
-uvAr3mL1jb5HpBLWvrI+MwwCcA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jolu.dev.it.secure.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>SU</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/kllin.it.su.se.xml b/swamid-1.0/kllin.it.su.se.xml
deleted file mode 100644
index 46df32fe..00000000
--- a/swamid-1.0/kllin.it.su.se.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kllin.it.su.se/Shibboleth.sso">
-
-  <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" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kllin.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kllin.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kllin.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=kllin.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>15729191459207018524</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJANpJUEuaJHgcMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmtsbGluLml0LnN1LnNlMB4XDTA5MDgxNzA4MDUyNVoXDTE5MDgxNTA4MDUy
-NVowGTEXMBUGA1UEAxMOa2xsaW4uaXQuc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCmHDXcoZT0FPZ5enxEI0K5ECKwBDaNWdRmv2DIY9weJviZ
-DBh4LJ3ddZe411PyCXaRwsymjQxJ4KROCgr0xpjl6d26AuKZlz3fV+5HTWmwLHnj
-yW4PD5TBClAd/ukshO9pONY2Z9LApdpzGhwQ055Yusd/SRGxjrxN2OTzLsJl1Nmm
-9HBVRjABhUmMSfEnx4aKEUXwxISzRmU0mtf2/GbGIWDbcX/0q9u+AZBCMHeJmCae
-MCnPVBsr05lAmQgTkHLqrorcgTjjGl7/tELLM4pAQZMI6M1dbdJ8fYoKnRlWUHDd
-pJcobJYlkWOqF7OkCRVSQZrCjr4xWG6TAwqxqcnhAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmtsbGluLml0LnN1LnNlMB0GA1UdDgQWBBQ5AK5fejFIsiD+5QZejcLpvF6t
-bTANBgkqhkiG9w0BAQUFAAOCAQEAD2YF3AD+9WKS4UAtQbN4/do94cnlspLh2CVL
-eJd64IzeOTFBtdP5utNFfWrZja/3L8/ZdAsuOJy//DbtgBi6nH4CmPogx8k0YeGh
-0SURQ5epR1VkZRHJXiSvQr9G3l04yQZ/UA82drixbJcr7ze5K3DeMl3lPq52uR7P
-9tWXWEuXlLLv/LNpa08YD1LR3KRncMuZX6H8buL0bI1bgu3oD7jK0MWR3jIZ0Mmk
-bjC9WQPwrYW+Ea5Y7eL5tbUEJ0p/rfQmlZDcI1JC2RNbymRnI0fopKpvQzrA+Gfz
-Kedo5bETr6pNxQLTjE3Bq7oYI/PUPOMfWf8Kd6HcLrE4NZDBOA==
-</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>kllin.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kllin.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=kllin.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>15729191459207018524</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJANpJUEuaJHgcMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmtsbGluLml0LnN1LnNlMB4XDTA5MDgxNzA4MDUyNVoXDTE5MDgxNTA4MDUy
-NVowGTEXMBUGA1UEAxMOa2xsaW4uaXQuc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCmHDXcoZT0FPZ5enxEI0K5ECKwBDaNWdRmv2DIY9weJviZ
-DBh4LJ3ddZe411PyCXaRwsymjQxJ4KROCgr0xpjl6d26AuKZlz3fV+5HTWmwLHnj
-yW4PD5TBClAd/ukshO9pONY2Z9LApdpzGhwQ055Yusd/SRGxjrxN2OTzLsJl1Nmm
-9HBVRjABhUmMSfEnx4aKEUXwxISzRmU0mtf2/GbGIWDbcX/0q9u+AZBCMHeJmCae
-MCnPVBsr05lAmQgTkHLqrorcgTjjGl7/tELLM4pAQZMI6M1dbdJ8fYoKnRlWUHDd
-pJcobJYlkWOqF7OkCRVSQZrCjr4xWG6TAwqxqcnhAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmtsbGluLml0LnN1LnNlMB0GA1UdDgQWBBQ5AK5fejFIsiD+5QZejcLpvF6t
-bTANBgkqhkiG9w0BAQUFAAOCAQEAD2YF3AD+9WKS4UAtQbN4/do94cnlspLh2CVL
-eJd64IzeOTFBtdP5utNFfWrZja/3L8/ZdAsuOJy//DbtgBi6nH4CmPogx8k0YeGh
-0SURQ5epR1VkZRHJXiSvQr9G3l04yQZ/UA82drixbJcr7ze5K3DeMl3lPq52uR7P
-9tWXWEuXlLLv/LNpa08YD1LR3KRncMuZX6H8buL0bI1bgu3oD7jK0MWR3jIZ0Mmk
-bjC9WQPwrYW+Ea5Y7eL5tbUEJ0p/rfQmlZDcI1JC2RNbymRnI0fopKpvQzrA+Gfz
-Kedo5bETr6pNxQLTjE3Bq7oYI/PUPOMfWf8Kd6HcLrE4NZDBOA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kllin.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kllin.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kllin.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kllin.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kllin.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kllin.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kllin.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kllin.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kllin.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kllin.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kllin.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kllin.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kllin.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kllin.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-1.0/lab03.lab.it.su.se.xml b/swamid-1.0/lab03.lab.it.su.se.xml
deleted file mode 100644
index de5f34af..00000000
--- a/swamid-1.0/lab03.lab.it.su.se.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lab03.lab.it.su.se">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" 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>MIIB4zCCAUygAwIBAgIJAKqPtbsIKhS9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmxhYjAzLmxhYi5pdC5zdS5zZTAeFw0wNzA1MDIwODA1NDdaFw0wODA1MDEwODA1NDdaMB0xGzAZBgNVBAMTEmxhYjAzLmxhYi5pdC5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvwFbKHSn0UpnszEG7YuVxKj+ZXKfsbcOJqHSiZMhGemw4CWc+ExXYFPDTSaphqatht3q17u9CFUkpygMo2HUWLWO5Zdk2lgpnhnT2B1xk8esRS0yjCwE0Gv9QewxaSCS+e+i5cMsXVhXD5zkBIKmW10p59YJ0qPwkRuwTcs02uUCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB10thLCTHsz++ZC5far37xRlor/7BF3o86JBtyqXNdYszFxgWYOILxC/rYiCxZr8ON1QKQ3ZNj+sZxZm1/fAQl+4hNCs1XgvoLRqK/eW4DHZLZWjQyn9+aHI1+ADkpzARLbJf5TQCJeJSmp+f3YIbqJQptXIGcBvLBSoe1R7Drag==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lab03.lab.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Mattias</GivenName>
-    <SurName>Amnefelt</SurName>
-    <EmailAddress>mattiasa@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/marcus.it.su.se.xml b/swamid-1.0/marcus.it.su.se.xml
deleted file mode 100644
index 6b18e948..00000000
--- a/swamid-1.0/marcus.it.su.se.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://marcus.it.su.se/Shibboleth.sso">
-
-  <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://marcus.it.su.se/Shibboleth.sso/WAYF" index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>marcus.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=marcus.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=marcus.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>15962408100384379222</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAN2F3ZhHOpFWMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21hcmN1cy5pdC5zdS5zZTAeFw0wOTA4MTcwODA5MTNaFw0xOTA4MTUwODA5
-MTNaMBoxGDAWBgNVBAMTD21hcmN1cy5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJoUzHh3CK6XAbe6UlJ8SiioYdjXJGU5LgW1JpsygbEJ
-fwNJ4dhOTyiAgtsEOZ4lO7EU06PByHrmlcDmjIJcmYXUIXcIC171dslQpVcYM0Vi
-8Lu6pzFrzAQyzuDv+R0bk4BFPDpRkOyORGVi7DRdHpUZFZ0LMQqi/6T/ewOC/nRJ
-hWLg9zkCwAv7yeGNF7Q03loxu55/8Rv4KhGSa77DHHWU8Bisd+PErH4GvzT1EncD
-YW/RkTXjYNDBy2x9jObn0HtMUvtsWbSSq992SiXLfmXk6nML2m6YCDeLGVCF9vhx
-hW46jIOjgDsAE5FjCkvTdSOUemPsxNx92uC6oCyg0AMCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbWFyY3VzLml0LnN1LnNlMB0GA1UdDgQWBBQxnjnxh3kB69c8TxWBb1wZ
-y0ccXDANBgkqhkiG9w0BAQUFAAOCAQEAJJREWXyuciC1veJVJWVpvNrQ5PIyaS02
-P3HE+lNfWgf+JOXusj5t4ZaWQg2bGL8zmayWEBvIh1MOIV6Tm3XtUIr7addFiqOe
-GnA0dEg0jXqqLKBwG3KtKsc+S3V6B6pZ3QX6NC5dcBlr/Os7i3GN8r2okZgr9Nh9
-0Ow5TS9WNvDXoXdzFKXEVv64byZzPKj1UDBiyBLfb+Fese8t0bl8EqhFTEmEbuHz
-IjK2CPinkLuGqqSMWdIAHIXRbhJKZH022rh9CE511WIInQLHi5VqcKDBRthh+pLM
-ALJ3grGodNXxRWcqAbAMSfyOPC+t9cD7n41LD6rlweKaNMW/aiS8XQ==
-</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>marcus.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=marcus.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=marcus.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>15962408100384379222</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAN2F3ZhHOpFWMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21hcmN1cy5pdC5zdS5zZTAeFw0wOTA4MTcwODA5MTNaFw0xOTA4MTUwODA5
-MTNaMBoxGDAWBgNVBAMTD21hcmN1cy5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJoUzHh3CK6XAbe6UlJ8SiioYdjXJGU5LgW1JpsygbEJ
-fwNJ4dhOTyiAgtsEOZ4lO7EU06PByHrmlcDmjIJcmYXUIXcIC171dslQpVcYM0Vi
-8Lu6pzFrzAQyzuDv+R0bk4BFPDpRkOyORGVi7DRdHpUZFZ0LMQqi/6T/ewOC/nRJ
-hWLg9zkCwAv7yeGNF7Q03loxu55/8Rv4KhGSa77DHHWU8Bisd+PErH4GvzT1EncD
-YW/RkTXjYNDBy2x9jObn0HtMUvtsWbSSq992SiXLfmXk6nML2m6YCDeLGVCF9vhx
-hW46jIOjgDsAE5FjCkvTdSOUemPsxNx92uC6oCyg0AMCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbWFyY3VzLml0LnN1LnNlMB0GA1UdDgQWBBQxnjnxh3kB69c8TxWBb1wZ
-y0ccXDANBgkqhkiG9w0BAQUFAAOCAQEAJJREWXyuciC1veJVJWVpvNrQ5PIyaS02
-P3HE+lNfWgf+JOXusj5t4ZaWQg2bGL8zmayWEBvIh1MOIV6Tm3XtUIr7addFiqOe
-GnA0dEg0jXqqLKBwG3KtKsc+S3V6B6pZ3QX6NC5dcBlr/Os7i3GN8r2okZgr9Nh9
-0Ow5TS9WNvDXoXdzFKXEVv64byZzPKj1UDBiyBLfb+Fese8t0bl8EqhFTEmEbuHz
-IjK2CPinkLuGqqSMWdIAHIXRbhJKZH022rh9CE511WIInQLHi5VqcKDBRthh+pLM
-ALJ3grGodNXxRWcqAbAMSfyOPC+t9cD7n41LD6rlweKaNMW/aiS8XQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marcus.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marcus.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marcus.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://marcus.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marcus.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marcus.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marcus.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://marcus.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marcus.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://marcus.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://marcus.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://marcus.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://marcus.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://marcus.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-1.0/sp1.lab.it.su.se.xml b/swamid-1.0/sp1.lab.it.su.se.xml
deleted file mode 100644
index 89683c8c..00000000
--- a/swamid-1.0/sp1.lab.it.su.se.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp1.lab.it.su.se">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" 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>MIIB+jCCAWOgAwIBAgIRAJVCJLoWBVtmqwrsh0psrA0wDQYJKoZIhvcNAQEFBQAwGzEZMBcGA1UEAxMQc3AxLmxhYi5pdC5zdS5zZTAeFw0wNjExMjcwODI4MDFaFw0wNjEyMzEyMzAwMDBaMBsxGTAXBgNVBAMTEHNwMS5sYWIuaXQuc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJHpeBYXpgvcLYDnlnJsATNVkEHzLsVga22m+Om1/32yCLnhH7DMlbhbaMb1r1oAX53O5rXXv5CX8AGR5rXkrADTO00LX7ChxFs3P6PhgQ/EnrSe0V71Armi82SAOHjzQkeWwjkxhLqLyWy7Y3Jw82VfBrAovUua7y+w21IGJtIJAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwID6DAqBgNVHSUBAf8EIDAeBggrBgEFBQcDBAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAFTiOOdKyQ+F9k++RqYiAkYYu/pXGwcl8vfhRTFX9Mnlzy/zy/ffDVBRRvhQPd0Lqm7mj/mkg1etLMb3S2fdWBa1pUeFQtSUxMqoACAngIdr+piFsbhu4u9UPUOdD8m9scpqQ1AusGxUmCBClEElZRtmqO9UwL7hD/fVE4TRU+a4</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp1.lab.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Leif</GivenName>
-    <SurName>Johansson</SurName>
-    <EmailAddress>leifj@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>