resolves SWAMIDOPS-6081

18 files changed, 0 insertions, 807 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index e64fe571..126a0729 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -1,16 +1,9 @@
 <?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/swamid-1.0.xml">
-  <xi:include href="swamid-1.0/atmail.it.su.se.xml"/>
   <xi:include href="swamid-1.0/order.kib.ki.se.xml"/>
-  <xi:include href="swamid-1.0/atmail-dev-01.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/atmail-dev-02.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/atmail-dev-03.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/atmail-dev-05.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/atmail-dev-08.it.su.se.xml"/>
   <xi:include href="swamid-1.0/dedserv79.levonline.com.xml"/>
   <xi:include href="swamid-1.0/mondo.su.se.xml"/>
   <xi:include href="swamid-1.0/mondo-test.su.se.xml"/>
-  <xi:include href="swamid-1.0/sakailab2.it.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/ensky.lhs.se.xml"/>
   <xi:include href="swamid-1.0/shib-sp.kau.se.xml"/>
   <xi:include href="swamid-1.0/www.wisum.umdac.umu.se.xml"/>
@@ -32,7 +25,6 @@
   <xi:include href="swamid-1.0/toylan3.umdc.umu.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/roundup-test.it.su.se.xml"/>
   <xi:include href="swamid-1.0/idp.test.umu.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"/>
@@ -45,10 +37,7 @@
   <xi:include href="swamid-1.0/idp.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/umdac-humpdac.ad.umu.se.xml"/>
   <xi:include href="swamid-1.0/sp.lhs.se.xml"/>
-  <xi:include href="swamid-1.0/sakailab1.it.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/roundup.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/tracks.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/sympa.lab.it.su.se.xml"/>
   <xi:include href="swamid-1.0/moodle.lhs.se.xml"/>
   <xi:include href="swamid-1.0/staging.dreamspark.com.xml"/>
   <xi:include href="swamid-1.0/slcstest.uninett.no.xml"/>
@@ -68,9 +57,7 @@
   <xi:include href="swamid-1.0/converis.info.xml"/>
   <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/fizzle.it.su.se.xml"/>
   <xi:include href="swamid-1.0/samadhi.kib.ki.se.xml"/>
-  <xi:include href="swamid-1.0/tomma.it.su.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"/>
@@ -80,7 +67,6 @@
   <xi:include href="swamid-1.0/identity.mdh.se.xml"/>
   <xi:include href="swamid-1.0/signon.hh.se.xml"/>
   <xi:include href="swamid-1.0/shibboleth.net.lu.se.xml"/>
-  <xi:include href="swamid-1.0/atmail-nightly-app1.it.su.se.xml"/>
   <xi:include href="swamid-1.0/idp.lnu.se.xml"/>
   <xi:include href="swamid-1.0/hbidp.hb.se.xml"/>
   <xi:include href="swamid-1.0/shib-idp-1.oru.se.xml"/>
@@ -94,9 +80,6 @@
   <xi:include href="swamid-1.0/sp-test.swamid.se.xml"/>
   <xi:include href="swamid-1.0/wbv9.ladok.umu.se.xml"/>
   <xi:include href="swamid-1.0/vmidgw.miun.se.xml"/>
-  <xi:include href="swamid-1.0/su-cal-nightly-app1.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/cal-nightly.it.su.se.xml"/>
-  <xi:include href="swamid-1.0/cal-dev.it.su.se.xml"/>
   <xi:include href="swamid-1.0/idp1.irf.se.xml"/>
   <xi:include href="swamid-1.0/bibliometrics.ki.se.xml"/>
   <xi:include href="swamid-1.0/uu.test.diva-portal.org.xml"/>
diff --git a/swamid-1.0/atmail-dev-01.it.su.se.xml b/swamid-1.0/atmail-dev-01.it.su.se.xml
deleted file mode 100644
index c6ba821f..00000000
--- a/swamid-1.0/atmail-dev-01.it.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://atmail-dev-01.it.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>MIIB+TCCAWKgAwIBAgIJAKMLZOIZMhLZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWF0bWFpbC1kZXYuaXQuc3Uuc2Utc2hpYmIuY3J0MB4XDTA5MDMwNTEyMzMz
-OVoXDTEwMDMwNTEyMzMzOVowKDEmMCQGA1UEAxMdYXRtYWlsLWRldi5pdC5zdS5z
-ZS1zaGliYi5jcnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL3asHFQGZX3
-ojnZrBw89ufD1Co/bLyNCgC++XHCCdxgqC4Dup279+45hrVS4J3uyWhFjKx2luff
-88QQ5XS4Bao3lwBbnct5ds83adFxCsS05l20YgSfDydWr6YBcssOq7ZvV/OJdkMI
-a0Uk+i6c+3+ChEVCwEZ9iRJdpuYEBT+3AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsG
-AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEASeqm
-fJn6M79EiZh66eKW+iaszRpXPVvJgr+Bzv0mXZ11IKBdZKRx0LoxcYWlu/RzT2q2
-qgK+ISTg38JgmSq0G2tqQ3M51njLA0Lyj9dTaSkV1r22jQkmh7q6lPeeA+yQ8RF4
-cNel/csgsvm7FfgPWaQyWTGnGzNo0PmNTl7nMoM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atmail-dev-01.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>SU</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/atmail-dev-02.it.su.se.xml b/swamid-1.0/atmail-dev-02.it.su.se.xml
deleted file mode 100644
index ebdf3d70..00000000
--- a/swamid-1.0/atmail-dev-02.it.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://atmail-dev-02.it.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>MIIB+TCCAWKgAwIBAgIJAKMLZOIZMhLZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWF0bWFpbC1kZXYuaXQuc3Uuc2Utc2hpYmIuY3J0MB4XDTA5MDMwNTEyMzMz
-OVoXDTEwMDMwNTEyMzMzOVowKDEmMCQGA1UEAxMdYXRtYWlsLWRldi5pdC5zdS5z
-ZS1zaGliYi5jcnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL3asHFQGZX3
-ojnZrBw89ufD1Co/bLyNCgC++XHCCdxgqC4Dup279+45hrVS4J3uyWhFjKx2luff
-88QQ5XS4Bao3lwBbnct5ds83adFxCsS05l20YgSfDydWr6YBcssOq7ZvV/OJdkMI
-a0Uk+i6c+3+ChEVCwEZ9iRJdpuYEBT+3AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsG
-AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEASeqm
-fJn6M79EiZh66eKW+iaszRpXPVvJgr+Bzv0mXZ11IKBdZKRx0LoxcYWlu/RzT2q2
-qgK+ISTg38JgmSq0G2tqQ3M51njLA0Lyj9dTaSkV1r22jQkmh7q6lPeeA+yQ8RF4
-cNel/csgsvm7FfgPWaQyWTGnGzNo0PmNTl7nMoM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atmail-dev-02.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>SU</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/atmail-dev-03.it.su.se.xml b/swamid-1.0/atmail-dev-03.it.su.se.xml
deleted file mode 100644
index 97d6503e..00000000
--- a/swamid-1.0/atmail-dev-03.it.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://atmail-dev-03.it.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>MIIB+TCCAWKgAwIBAgIJAKMLZOIZMhLZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWF0bWFpbC1kZXYuaXQuc3Uuc2Utc2hpYmIuY3J0MB4XDTA5MDMwNTEyMzMz
-OVoXDTEwMDMwNTEyMzMzOVowKDEmMCQGA1UEAxMdYXRtYWlsLWRldi5pdC5zdS5z
-ZS1zaGliYi5jcnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL3asHFQGZX3
-ojnZrBw89ufD1Co/bLyNCgC++XHCCdxgqC4Dup279+45hrVS4J3uyWhFjKx2luff
-88QQ5XS4Bao3lwBbnct5ds83adFxCsS05l20YgSfDydWr6YBcssOq7ZvV/OJdkMI
-a0Uk+i6c+3+ChEVCwEZ9iRJdpuYEBT+3AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsG
-AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEASeqm
-fJn6M79EiZh66eKW+iaszRpXPVvJgr+Bzv0mXZ11IKBdZKRx0LoxcYWlu/RzT2q2
-qgK+ISTg38JgmSq0G2tqQ3M51njLA0Lyj9dTaSkV1r22jQkmh7q6lPeeA+yQ8RF4
-cNel/csgsvm7FfgPWaQyWTGnGzNo0PmNTl7nMoM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atmail-dev-03.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>SU</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/atmail-dev-05.it.su.se.xml b/swamid-1.0/atmail-dev-05.it.su.se.xml
deleted file mode 100644
index 29f34c04..00000000
--- a/swamid-1.0/atmail-dev-05.it.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://atmail-dev-05.it.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>MIIB+TCCAWKgAwIBAgIJAKMLZOIZMhLZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWF0bWFpbC1kZXYuaXQuc3Uuc2Utc2hpYmIuY3J0MB4XDTA5MDMwNTEyMzMz
-OVoXDTEwMDMwNTEyMzMzOVowKDEmMCQGA1UEAxMdYXRtYWlsLWRldi5pdC5zdS5z
-ZS1zaGliYi5jcnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL3asHFQGZX3
-ojnZrBw89ufD1Co/bLyNCgC++XHCCdxgqC4Dup279+45hrVS4J3uyWhFjKx2luff
-88QQ5XS4Bao3lwBbnct5ds83adFxCsS05l20YgSfDydWr6YBcssOq7ZvV/OJdkMI
-a0Uk+i6c+3+ChEVCwEZ9iRJdpuYEBT+3AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsG
-AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEASeqm
-fJn6M79EiZh66eKW+iaszRpXPVvJgr+Bzv0mXZ11IKBdZKRx0LoxcYWlu/RzT2q2
-qgK+ISTg38JgmSq0G2tqQ3M51njLA0Lyj9dTaSkV1r22jQkmh7q6lPeeA+yQ8RF4
-cNel/csgsvm7FfgPWaQyWTGnGzNo0PmNTl7nMoM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atmail-dev-05.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>SU</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/atmail-dev-08.it.su.se.xml b/swamid-1.0/atmail-dev-08.it.su.se.xml
deleted file mode 100644
index 06765a81..00000000
--- a/swamid-1.0/atmail-dev-08.it.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://atmail-dev-08.it.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>MIIB+TCCAWKgAwIBAgIJAKMLZOIZMhLZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWF0bWFpbC1kZXYuaXQuc3Uuc2Utc2hpYmIuY3J0MB4XDTA5MDMwNTEyMzMz
-OVoXDTEwMDMwNTEyMzMzOVowKDEmMCQGA1UEAxMdYXRtYWlsLWRldi5pdC5zdS5z
-ZS1zaGliYi5jcnQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL3asHFQGZX3
-ojnZrBw89ufD1Co/bLyNCgC++XHCCdxgqC4Dup279+45hrVS4J3uyWhFjKx2luff
-88QQ5XS4Bao3lwBbnct5ds83adFxCsS05l20YgSfDydWr6YBcssOq7ZvV/OJdkMI
-a0Uk+i6c+3+ChEVCwEZ9iRJdpuYEBT+3AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsG
-AQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEASeqm
-fJn6M79EiZh66eKW+iaszRpXPVvJgr+Bzv0mXZ11IKBdZKRx0LoxcYWlu/RzT2q2
-qgK+ISTg38JgmSq0G2tqQ3M51njLA0Lyj9dTaSkV1r22jQkmh7q6lPeeA+yQ8RF4
-cNel/csgsvm7FfgPWaQyWTGnGzNo0PmNTl7nMoM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atmail-dev-08.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>SU</Company>
-    <GivenName>Joakim</GivenName>
-    <SurName>Lundin</SurName>
-    <EmailAddress>jolu@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/atmail-nightly-app1.it.su.se.xml b/swamid-1.0/atmail-nightly-app1.it.su.se.xml
deleted file mode 100644
index a53ae260..00000000
--- a/swamid-1.0/atmail-nightly-app1.it.su.se.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://atmail-nightly-app1.it.su.se/Shibboleth.sso">
-
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://atmail-nightly-app1.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>atmail-nightly-app1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=atmail-nightly-app1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAOFrZnyP1MyFMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHGF0bWFpbC1uaWdodGx5LWFwcDEuaXQuc3Uuc2UwHhcNMDkwOTMwMTI0NDM1
-WhcNMTkwOTI4MTI0NDM1WjAnMSUwIwYDVQQDExxhdG1haWwtbmlnaHRseS1hcHAx
-Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtNYie2Im
-/ZD/riJn2diprdndssBIHAK6HOYPT7FJlDaDTYlZtikIplvTcC4cR6G5zYnHoMla
-CGOgvsE5jhVmibAiGdlDDWmc7UKrycnx+Y3SAS14YlEYltmtSCwFdcLAyFmJdbak
-AbaW7yWxLh72bQdvqpbqtXBjduViHprCUTjF5HZ0a2jd87bGDCDh3DCZqslnxDrn
-oceQnSXrLYergmpNXd/3Do+cX+jLTNOy9gCxjnZKrEu1GCUP5Ull5LwTyzgFGgIi
-x969TTfxSg+gaIsL1OQzfE3CFtF+ccDuLm792oE/rNp+FFo5tl8rKgtIiz1NO3dM
-LIHM8Q3C6qhNswIDAQABo0owSDAnBgNVHREEIDAeghxhdG1haWwtbmlnaHRseS1h
-cHAxLml0LnN1LnNlMB0GA1UdDgQWBBSEXGCU2fTOeASt+CvNhcjdCtwPTzANBgkq
-hkiG9w0BAQUFAAOCAQEAMsl0odrbePviDCcc1j8F5g/EJIhbScpSPnZJDf5BGVxD
-FmF2Nt2IL3+gaXZSeGp/oHq1fnh8w+7Oo64kEsEKGpqCgMIGb6OaG73FwOgBsAbg
-SoRwl695zGac73eNc8sZWP0jnCPgd7fFkbgmCYGb8lN++ouu//JSvqh7XiEs4sMg
-YPtVVEkBG59Vn4EnRWmv8ZMOzbPBLEmUFVIEwrSk4RUwPrABJKSxIZP2VKP9sKaD
-wUZ/tOfZ9zAaEDfeQal/UCEJtUioDHknnxUp9S8O0EAsK+j2rr0he+FG8N+9zxZA
-S1VaYG66w0GY6D0F6qUMYBXjPrkLsX96HGQaP5ErOQ==
-</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>atmail-nightly-app1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=atmail-nightly-app1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAOFrZnyP1MyFMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHGF0bWFpbC1uaWdodGx5LWFwcDEuaXQuc3Uuc2UwHhcNMDkwOTMwMTI0NDM1
-WhcNMTkwOTI4MTI0NDM1WjAnMSUwIwYDVQQDExxhdG1haWwtbmlnaHRseS1hcHAx
-Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtNYie2Im
-/ZD/riJn2diprdndssBIHAK6HOYPT7FJlDaDTYlZtikIplvTcC4cR6G5zYnHoMla
-CGOgvsE5jhVmibAiGdlDDWmc7UKrycnx+Y3SAS14YlEYltmtSCwFdcLAyFmJdbak
-AbaW7yWxLh72bQdvqpbqtXBjduViHprCUTjF5HZ0a2jd87bGDCDh3DCZqslnxDrn
-oceQnSXrLYergmpNXd/3Do+cX+jLTNOy9gCxjnZKrEu1GCUP5Ull5LwTyzgFGgIi
-x969TTfxSg+gaIsL1OQzfE3CFtF+ccDuLm792oE/rNp+FFo5tl8rKgtIiz1NO3dM
-LIHM8Q3C6qhNswIDAQABo0owSDAnBgNVHREEIDAeghxhdG1haWwtbmlnaHRseS1h
-cHAxLml0LnN1LnNlMB0GA1UdDgQWBBSEXGCU2fTOeASt+CvNhcjdCtwPTzANBgkq
-hkiG9w0BAQUFAAOCAQEAMsl0odrbePviDCcc1j8F5g/EJIhbScpSPnZJDf5BGVxD
-FmF2Nt2IL3+gaXZSeGp/oHq1fnh8w+7Oo64kEsEKGpqCgMIGb6OaG73FwOgBsAbg
-SoRwl695zGac73eNc8sZWP0jnCPgd7fFkbgmCYGb8lN++ouu//JSvqh7XiEs4sMg
-YPtVVEkBG59Vn4EnRWmv8ZMOzbPBLEmUFVIEwrSk4RUwPrABJKSxIZP2VKP9sKaD
-wUZ/tOfZ9zAaEDfeQal/UCEJtUioDHknnxUp9S8O0EAsK+j2rr0he+FG8N+9zxZA
-S1VaYG66w0GY6D0F6qUMYBXjPrkLsX96HGQaP5ErOQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atmail-nightly-app1.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://atmail-nightly-app1.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://atmail-nightly-app1.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://atmail-nightly-app1.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/atmail.it.su.se.xml b/swamid-1.0/atmail.it.su.se.xml
deleted file mode 100644
index b48622c6..00000000
--- a/swamid-1.0/atmail.it.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://atmail.it.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>MIIB3TCCAUagAwIBAgIJANxweZKmoF/1MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2F0bWFpbC5pdC5zdS5zZTAeFw0wOTAzMDYxMjAwMzZaFw0xMDAzMDYxMjAw
-MzZaMBoxGDAWBgNVBAMTD2F0bWFpbC5pdC5zdS5zZTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEArjRI35nDap2bPKSwCTCma3+JocxQH6YwkJG4E7BHwBpoFzbC
-r1vEZeP5feZNb7H1OrO7U/yTMqqLapljeCyHz7tIscnSfE/uRlaJ1rzpY4jEiRpo
-LWKpXOMSc484CDf3n2YERQonP3QHI2q+FyIPPPPyaHmQctKxeuPkH4sO4K0CAwEA
-AaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDAN
-BgkqhkiG9w0BAQUFAAOBgQCl0yPGhsEInSQRCRfAZlS4ZngXPxLpu2j4a6asoo2P
-LnWJfnUPCY81o90j6uNeZ5VEXbRoTi5ZoVjbi2hLzn0XAxRhL8VXrYk6/kduHH1Z
-2KVxwbLyfwYHUZZ2zijZRNiiG2Pi0ICqEjaT0iv4I4J/m7jZDn6vW7h5MELG6cH9
-ew==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atmail.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>SU</Company>
-    <GivenName>Stockholms universitet</GivenName>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/cal-dev.it.su.se.xml b/swamid-1.0/cal-dev.it.su.se.xml
deleted file mode 100644
index 6dc3abb5..00000000
--- a/swamid-1.0/cal-dev.it.su.se.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cal-dev.it.su.se/Shibboleth.sso">
-
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://cal-dev.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>cal-dev.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cal-dev.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJALkY0nnZUc0FMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGNhbC1kZXYuaXQuc3Uuc2UwHhcNMDkxMTA5MTEzODM0WhcNMTkxMTA3MTEz
-ODM0WjAbMRkwFwYDVQQDExBjYWwtZGV2Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxWSTwBpDBnb2vtry6eeePT6ikKLdQUNq4m/yya1H
-RPbZWkj/EUT9UNmAQrinHtVHiQFdZeRpyVkvI68QgDMh6eFfqDhHHDntYrE1PISU
-ho+bZDhCuHtWkf/hxKpw0RCXto5TR49Rf956qWe80sfpMAJTEmU/Ug+v4LYBuxxj
-FpvAuuJCe1AbRdMtjpl7Fz8B1kVsJSRFih9xMYf19e/jqzmglHMCD7uis6fjp82A
-sFaoWYiaaYbeazBa3gs4Zg71EZnN+3MgI0SDHtllMuJ+ytGspwWfYEOtakRfMn4P
-+dS02o+vZvSKh9By5YCSYGRHDbFjS/wDX8JUXF6bHoj9HQIDAQABoz4wPDAbBgNV
-HREEFDASghBjYWwtZGV2Lml0LnN1LnNlMB0GA1UdDgQWBBQoNTXy9bUw7pRfLyVe
-4QsLUDIU1DANBgkqhkiG9w0BAQUFAAOCAQEAVWOwOmylgh5kCDIEN+pLOcSpYOyF
-tkzr2teFKH1LTTh16RJtH+HmtjL5kUmYqnMT9hzM+NvNa1BcJjPpdnQsiaekZ/Cy
-3zCNhY6CxtTMzBkQZhAotvoVoiSKe/993l+vVutgy7aGUnhzlr507Xgk3XzDcYG7
-veS2S9AiKjtuzIoXuLE5pin07CCjPltdnnDKQ0pG8Bhsp7MXcRTqNcM6JLlY6b76
-K2Y73Qze4hoeZaaCMLg30NkU8gq9AjjxKUmJPTXKUh8VXpd5fvfkIrcNDqL2+efR
-fNWVpx/yUFabNXd35T8BGeiOtrt2JpIJ7jTq4rEaFYacMaGyRFP1LEMZUQ==
-</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>cal-dev.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cal-dev.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJALkY0nnZUc0FMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGNhbC1kZXYuaXQuc3Uuc2UwHhcNMDkxMTA5MTEzODM0WhcNMTkxMTA3MTEz
-ODM0WjAbMRkwFwYDVQQDExBjYWwtZGV2Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxWSTwBpDBnb2vtry6eeePT6ikKLdQUNq4m/yya1H
-RPbZWkj/EUT9UNmAQrinHtVHiQFdZeRpyVkvI68QgDMh6eFfqDhHHDntYrE1PISU
-ho+bZDhCuHtWkf/hxKpw0RCXto5TR49Rf956qWe80sfpMAJTEmU/Ug+v4LYBuxxj
-FpvAuuJCe1AbRdMtjpl7Fz8B1kVsJSRFih9xMYf19e/jqzmglHMCD7uis6fjp82A
-sFaoWYiaaYbeazBa3gs4Zg71EZnN+3MgI0SDHtllMuJ+ytGspwWfYEOtakRfMn4P
-+dS02o+vZvSKh9By5YCSYGRHDbFjS/wDX8JUXF6bHoj9HQIDAQABoz4wPDAbBgNV
-HREEFDASghBjYWwtZGV2Lml0LnN1LnNlMB0GA1UdDgQWBBQoNTXy9bUw7pRfLyVe
-4QsLUDIU1DANBgkqhkiG9w0BAQUFAAOCAQEAVWOwOmylgh5kCDIEN+pLOcSpYOyF
-tkzr2teFKH1LTTh16RJtH+HmtjL5kUmYqnMT9hzM+NvNa1BcJjPpdnQsiaekZ/Cy
-3zCNhY6CxtTMzBkQZhAotvoVoiSKe/993l+vVutgy7aGUnhzlr507Xgk3XzDcYG7
-veS2S9AiKjtuzIoXuLE5pin07CCjPltdnnDKQ0pG8Bhsp7MXcRTqNcM6JLlY6b76
-K2Y73Qze4hoeZaaCMLg30NkU8gq9AjjxKUmJPTXKUh8VXpd5fvfkIrcNDqL2+efR
-fNWVpx/yUFabNXd35T8BGeiOtrt2JpIJ7jTq4rEaFYacMaGyRFP1LEMZUQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cal-dev.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cal-dev.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cal-dev.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cal-dev.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cal-dev.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cal-dev.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cal-dev.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cal-dev.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cal-dev.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cal-dev.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cal-dev.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://cal-dev.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://cal-dev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cal-dev.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/cal-nightly.it.su.se.xml b/swamid-1.0/cal-nightly.it.su.se.xml
deleted file mode 100644
index e21a4f85..00000000
--- a/swamid-1.0/cal-nightly.it.su.se.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cal-nightly.it.su.se/Shibboleth.sso">
-
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://cal-nightly.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>cal-nightly.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cal-nightly.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAPrR78IUbnaDMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGNhbC1uaWdodGx5Lml0LnN1LnNlMB4XDTA5MTEwOTEzMDAwMloXDTE5MTEw
-NzEzMDAwMlowHzEdMBsGA1UEAxMUY2FsLW5pZ2h0bHkuaXQuc3Uuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1wUsW30OsMvOipZ2M4qhKsuMUjmVk
-siCxB4iPYHUdsLlvJYGovXg4OILBKp4y3lDKD5hGYC44am6vaUXbZDs4KuOi7Doz
-gONybQe8v7Co3QuWRY8clly5o3m51J/XBVcVmGdv32e9d3VZIDkcr7GgCz9yABYh
-R1oirmBu1r+9GiYpU2zT6wUf5Vj7uBf2VyarTr/brEBl2k8pHLkShU9kEyhHlSWP
-Q9k02Qjqpcfj3Yz4RWV/tZk0MevUl6PwXFso/x70Z2NPtv2UUornp9nXivazWAJB
-cWG14ELwZ3dd/9916keHl3fyZzBuAkotxvorWXSUFvUxAGG4uTK930rfAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGNhbC1uaWdodGx5Lml0LnN1LnNlMB0GA1UdDgQWBBQh
-1cI97A9R0/bTqzP2mENS2x6BlzANBgkqhkiG9w0BAQUFAAOCAQEAW3CXSheCqrJ/
-SW0jsW6+5ajwexnLscziOEQ6Px1FX6elaAnlBAqxPIE2MZe7VrT2DNeN8VvefG6E
-RspoEJ0qut0vHoKRxUNss0MHMesA8knT7ZPoFvXjvJsu8mow1cfTa4eURx1oqdTA
-uOfPLvbFOO7Oy7jccq6RXUdnYJFyDo8CNDVYhzRYoH8PYQmR6+t+gIGJxG3b8Afr
-FopB+PnMTa6fOqtiR9mUb4bAXPWxENx07funZVPaz0z7HihsxweN/PpPTMefNZ9m
-x2Rt/PtgeIXWTFjQqqRfnmqMbjbc3e8mmLIVAz7mEaz4PaeqWZi8QeiI89B51OhY
-yGLhnT7NgQ==
-</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>cal-nightly.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cal-nightly.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAPrR78IUbnaDMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGNhbC1uaWdodGx5Lml0LnN1LnNlMB4XDTA5MTEwOTEzMDAwMloXDTE5MTEw
-NzEzMDAwMlowHzEdMBsGA1UEAxMUY2FsLW5pZ2h0bHkuaXQuc3Uuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1wUsW30OsMvOipZ2M4qhKsuMUjmVk
-siCxB4iPYHUdsLlvJYGovXg4OILBKp4y3lDKD5hGYC44am6vaUXbZDs4KuOi7Doz
-gONybQe8v7Co3QuWRY8clly5o3m51J/XBVcVmGdv32e9d3VZIDkcr7GgCz9yABYh
-R1oirmBu1r+9GiYpU2zT6wUf5Vj7uBf2VyarTr/brEBl2k8pHLkShU9kEyhHlSWP
-Q9k02Qjqpcfj3Yz4RWV/tZk0MevUl6PwXFso/x70Z2NPtv2UUornp9nXivazWAJB
-cWG14ELwZ3dd/9916keHl3fyZzBuAkotxvorWXSUFvUxAGG4uTK930rfAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGNhbC1uaWdodGx5Lml0LnN1LnNlMB0GA1UdDgQWBBQh
-1cI97A9R0/bTqzP2mENS2x6BlzANBgkqhkiG9w0BAQUFAAOCAQEAW3CXSheCqrJ/
-SW0jsW6+5ajwexnLscziOEQ6Px1FX6elaAnlBAqxPIE2MZe7VrT2DNeN8VvefG6E
-RspoEJ0qut0vHoKRxUNss0MHMesA8knT7ZPoFvXjvJsu8mow1cfTa4eURx1oqdTA
-uOfPLvbFOO7Oy7jccq6RXUdnYJFyDo8CNDVYhzRYoH8PYQmR6+t+gIGJxG3b8Afr
-FopB+PnMTa6fOqtiR9mUb4bAXPWxENx07funZVPaz0z7HihsxweN/PpPTMefNZ9m
-x2Rt/PtgeIXWTFjQqqRfnmqMbjbc3e8mmLIVAz7mEaz4PaeqWZi8QeiI89B51OhY
-yGLhnT7NgQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cal-nightly.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cal-nightly.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cal-nightly.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cal-nightly.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cal-nightly.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cal-nightly.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cal-nightly.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cal-nightly.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cal-nightly.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cal-nightly.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cal-nightly.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://cal-nightly.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://cal-nightly.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cal-nightly.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/fizzle.it.su.se.xml b/swamid-1.0/fizzle.it.su.se.xml
deleted file mode 100644
index 51a870fc..00000000
--- a/swamid-1.0/fizzle.it.su.se.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fizzle.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://fizzle.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>fizzle.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=fizzle.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=fizzle.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>18230749534564283965</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAP0Aohxs0nY9MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2ZpenpsZS5pdC5zdS5zZTAeFw0wOTA4MDYwNzAwNTVaFw0xOTA4MDQwNzAw
-NTVaMBoxGDAWBgNVBAMTD2ZpenpsZS5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALaKANSaO/Nx4b+jqPpTk+YJcemc/XyeXfbqpQaMm10u
-u0TcaPaVRr9AHZuk6dj/mnPiKMa3YpfIvTOHp9wBSck74UXCJGhXHUzFM7tFqvjW
-u+SFhHyWneDJXdfnH+wE05mmsUYgFZRqLypnDa/zhB8cvvQdZBWxiKHNf62JWgUV
-O8Tqm9ri0A6qt5yUOP3ZBLIbTUrj8ute8KV7EmFQgW6jGYUEInI6qNJvGmbfE2fH
-NtW1xnJWhhxSUtfZx0YVKE02Ln4k64I35kMbPrGd2ShuwI/RMKmAOQKaYZm/Ez0z
-dvsH1fDR5LVlsIRm/tUQ4lN1XSVqgc126mkT+SBW4x8CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPZml6emxlLml0LnN1LnNlMB0GA1UdDgQWBBTLYXgDsgtuIKHQdoPDPD7C
-aI2DCTANBgkqhkiG9w0BAQUFAAOCAQEALCqAG4D1JA1SGMyk/rPsAJZ+lNyoZuNJ
-7m9W1vXQYX6ocN57H9mpL/eV8rtpSn0esXd3aj8uztWhURJEv/jKHfwPsxiacGHV
-7vcqhWXIpFOcD0kGeQzs/AhocYRPb2tan2n9lqHSkjd2XYI6NMyotraSNk0M+9tb
-DiqBpP+eq8n6Wswj5K9NjF72ciFG6hvhbuJV+vsIdqPrTSugvZ/XToLQ7n+VohTj
-SF0RJ+2Hb5V2vyOJ/4k8UdhxPfb1PaLdGZ4Z7IdTa6NhupDNet64yz2fGxjpaL7r
-xbcb1dNzaX2Vm6IIxQ4skPlMqcCpjCkM+y1k7RZ7OqaY6aEZPnXpdQ==
-</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>fizzle.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=fizzle.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=fizzle.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>18230749534564283965</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAP0Aohxs0nY9MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2ZpenpsZS5pdC5zdS5zZTAeFw0wOTA4MDYwNzAwNTVaFw0xOTA4MDQwNzAw
-NTVaMBoxGDAWBgNVBAMTD2ZpenpsZS5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALaKANSaO/Nx4b+jqPpTk+YJcemc/XyeXfbqpQaMm10u
-u0TcaPaVRr9AHZuk6dj/mnPiKMa3YpfIvTOHp9wBSck74UXCJGhXHUzFM7tFqvjW
-u+SFhHyWneDJXdfnH+wE05mmsUYgFZRqLypnDa/zhB8cvvQdZBWxiKHNf62JWgUV
-O8Tqm9ri0A6qt5yUOP3ZBLIbTUrj8ute8KV7EmFQgW6jGYUEInI6qNJvGmbfE2fH
-NtW1xnJWhhxSUtfZx0YVKE02Ln4k64I35kMbPrGd2ShuwI/RMKmAOQKaYZm/Ez0z
-dvsH1fDR5LVlsIRm/tUQ4lN1XSVqgc126mkT+SBW4x8CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPZml6emxlLml0LnN1LnNlMB0GA1UdDgQWBBTLYXgDsgtuIKHQdoPDPD7C
-aI2DCTANBgkqhkiG9w0BAQUFAAOCAQEALCqAG4D1JA1SGMyk/rPsAJZ+lNyoZuNJ
-7m9W1vXQYX6ocN57H9mpL/eV8rtpSn0esXd3aj8uztWhURJEv/jKHfwPsxiacGHV
-7vcqhWXIpFOcD0kGeQzs/AhocYRPb2tan2n9lqHSkjd2XYI6NMyotraSNk0M+9tb
-DiqBpP+eq8n6Wswj5K9NjF72ciFG6hvhbuJV+vsIdqPrTSugvZ/XToLQ7n+VohTj
-SF0RJ+2Hb5V2vyOJ/4k8UdhxPfb1PaLdGZ4Z7IdTa6NhupDNet64yz2fGxjpaL7r
-xbcb1dNzaX2Vm6IIxQ4skPlMqcCpjCkM+y1k7RZ7OqaY6aEZPnXpdQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fizzle.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fizzle.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fizzle.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fizzle.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fizzle.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fizzle.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fizzle.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fizzle.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fizzle.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://fizzle.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://fizzle.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fizzle.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fizzle.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fizzle.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-1.0/roundup-test.it.su.se.xml b/swamid-1.0/roundup-test.it.su.se.xml
deleted file mode 100644
index 9c9abcda..00000000
--- a/swamid-1.0/roundup-test.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://roundup-test.it.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>MIIEvDCCA6SgAwIBAgILAQAAAAABHEtYz+8wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDkxMDA4MjAyM1oXDTExMDkxMDA4MjAyM1owYjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEeMBwGA1UEAxMVcm91bmR1cC10ZXN0Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWia8Li3lAlfEHtajbEj7JE3xX31jtPI8mWIbrv82bM1UqfJNFOtrYoukrOLwB8y/trTytPxNOykhAEOK8uElNIJWvrmpe2Upmn/yAxT+7FT8RYECh558rLYdwE7RKiu9W4W/mztFKXGTVsG6c0PmUh+bchTW7XikyqhuvyHaYBZ2Qf+mMMk4No0qCtLakjvWaMXEEJRSEMiMPXBkkpaaAwBVc9baK0+EYuTKII2L4tx2eNSzposXqj2lSks70tHsJnTHUBYeVZiVPYpeu34kO/0NPBeq9CFgk49aHZpuq+iQBx/BX1I2Z5iRV+UY0eZpENVapWf6M1nYz6h7HcXUQIDAQABo4IBdDCCAXAwUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUdj87P0v1GpRPfbrHmKPY4EvzN8AwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCAGA1UdEQQZMBeCFXJvdW5kdXAtdGVzdC5pdC5zdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAiRmbVYXHgEs6d68zfqAsHBLUGrysmZkJnx1603o5CbMxG0DSVtUPWL9artz68/dazxvI4zdrkxNb9j8mHTOZ6jYYon3VwI4d4RSjuXtRTfa+Tc9qGsi79U7ALH4RgFp6ltAZL+r3vKFKwWnD5ToXtm0S3ih8LUxtKNpTb3mlv2Ib8nCcsmR91y+Dl0ypgxp/Kqoi0jEcijffZXkfzmKmcOlsbrBZw4BJzogHVTdGFj3P5oJy13h+oldS7kwYljI2h7Z+BVMmrSguWTgqbErhQInbOiZggQhfB3x70OdJs4DDrMzSQctqEXlj+Eb7qSdYyuP1kMjI1P+0IGLq+PSN6A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://roundup-test.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>SU</Company>
-    <GivenName>Klas</GivenName>
-    <SurName>Lindforss</SurName>
-    <EmailAddress>kllin@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/sakailab1.it.secure.su.se.xml b/swamid-1.0/sakailab1.it.secure.su.se.xml
deleted file mode 100644
index aeb0227b..00000000
--- a/swamid-1.0/sakailab1.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://sakailab1.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>MIIB8TCCAVqgAwIBAgIJAKXyew6LHCQ5MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXNha2FpbGFiMS5pdC5zZWN1cmUuc3Uuc2UwHhcNMDcwNDA1MTU0NDMwWhcNMDgwNDA0MTU0NDMwWjAkMSIwIAYDVQQDExlzYWthaWxhYjEuaXQuc2VjdXJlLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgun00RCrC7MkeeVC/Wrmpb3Z0oCFbsq4n54JSZ4LZcH2KQm5p34GSgRWv07ki4Sa9UPuG4cqv89RkHpDzGIWxQ5kBFK6Huo0Iq+/RnmerUnfpX6GKBNQqOqtS0CNmMl1dwKrVemiMAQjxOUEX0HQdCI3V77R7TMCodcbSOfotgQIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAAFteLcTuaDnorYmeupV0+ZzPk6RN/6UP5SW+oxsFA7aeg86y5f0c2uxsDhdYV1XvMVmVZ+3FCtjARsup0I6hBcWl2GMRYhF2MxJQk23Vir43VOpAxt4OtHjH7Uo3eCgARMDlUayFVB1iiaoDAjsuucg0rOu+3V2nZ3OL6bkdHhz</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sakailab1.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>Leif</GivenName>
-    <SurName>Johansson</SurName>
-    <EmailAddress>leifj@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/sakailab2.it.secure.su.se.xml b/swamid-1.0/sakailab2.it.secure.su.se.xml
deleted file mode 100644
index 3fa53cf1..00000000
--- a/swamid-1.0/sakailab2.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://sakailab2.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>MIIB8TCCAVqgAwIBAgIJAP4MwiI1u4AIMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXNha2FpbGFiMi5pdC5zZWN1cmUuc3Uuc2UwHhcNMDcwNDEzMDgyMzI0WhcNMDgwNDEyMDgyMzI0WjAkMSIwIAYDVQQDExlzYWthaWxhYjIuaXQuc2VjdXJlLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCij2ONEMrxXluEiQ64CbRCzSxQytiYJZ+v4DEuE4EoLNFXNI6lgRuz4IJeE6Trc8A5k1yvBS8Nd+9XemLESG02z5xcaRI0dyc4SItOcPnsMYI9ionl/ieQmS0Nr3PBM4LPla6MDAQkGblnEdfKQ6Ht5UFI2VGBIAfZEpQezcxiWQIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBABHSliUMz1w1CBX2arDOnAwS61/a2uUMer4fejYGXIl5Ch3j8xtHrTQ5lezjNXYZKMZIT7rraDmqwPJv2SBsrD4CJVY/D5frOSYokfScetjtXIUyzSGqBGZruxEZcDkou9uUacG2AWTvLnUuagH1Xtu9RrWVV1+n/MpKPXgIzKEk</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sakailab2.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>joakim.lundin@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/su-cal-nightly-app1.it.su.se.xml b/swamid-1.0/su-cal-nightly-app1.it.su.se.xml
deleted file mode 100644
index 34366df0..00000000
--- a/swamid-1.0/su-cal-nightly-app1.it.su.se.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso">
-
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://su-cal-nightly-app1.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>su-cal-nightly-app1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=su-cal-nightly-app1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAM9JF/oDtQlwMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHN1LWNhbC1uaWdodGx5LWFwcDEuaXQuc3Uuc2UwHhcNMDkxMTA0MTExMTUy
-WhcNMTkxMTAyMTExMTUyWjAnMSUwIwYDVQQDExxzdS1jYWwtbmlnaHRseS1hcHAx
-Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySO5D9PH
-5wmlMEQ4BwhEyIf9a4RRNxjlMCWCQdU5jYS9K6wEsjn2BNC4qrG6wxDEwO6ac6ag
-gX0klGB+YH5GXj0Wi7XzlaL5qjU/1LP4E5wNY1kMCnwe4QlQVYFREc6a+CYymVxQ
-lr64DYno52B3uiePFsNoT+K67PE5qKDHi1zyyddxt3rgv2exolqifKqjkTwKFII1
-us9B/TdFEWgfNbcDKABRHPzVa1Ac14nSpEOGE9dUgpRxzcfgsL+zi9eIagBn7PRk
-f5zYKZEJAaS4kiz8Y2QFn8twanQu3b6wGcAYErxOWOEwZ/JLg0FHpfEw8AWRsqV4
-dpwstJJYCOVxtwIDAQABo0owSDAnBgNVHREEIDAeghxzdS1jYWwtbmlnaHRseS1h
-cHAxLml0LnN1LnNlMB0GA1UdDgQWBBQDz89CwxmfsQuLbFXdX3McXwNd3jANBgkq
-hkiG9w0BAQUFAAOCAQEAKwRRHK4vHmT4UtiknIvuj8kWaglu3GhQ07kyqrlKi3zF
-2QcH33QgTzmlrbya354/eNpaPUk9xPEUebqp+awcWL1vKejvuW9ZYqK6zaEHnlkC
-HSr/YuL21XsHRCw6Z7+Aez6CvjTSFLUMvmuxhJBgLG7wccvt4n3uYuGQTcStuS8c
-53fqQRqee2V2LLyBwYlgA9+P47VSHHjkM99MJmzpFUsO9vOtp8p3sE0upN3hk/zV
-w1zfPzRsVfUSjKUblBGVNDAZ6yL9i9ZjunCzr3Y+q6dZl6wdNboW0m1L3IOnTyhK
-PuL4GI0NPLrUy5b7LaONfTgL4fQq0t+TQzeU31/zig==
-</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>su-cal-nightly-app1.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=su-cal-nightly-app1.it.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAM9JF/oDtQlwMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHN1LWNhbC1uaWdodGx5LWFwcDEuaXQuc3Uuc2UwHhcNMDkxMTA0MTExMTUy
-WhcNMTkxMTAyMTExMTUyWjAnMSUwIwYDVQQDExxzdS1jYWwtbmlnaHRseS1hcHAx
-Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySO5D9PH
-5wmlMEQ4BwhEyIf9a4RRNxjlMCWCQdU5jYS9K6wEsjn2BNC4qrG6wxDEwO6ac6ag
-gX0klGB+YH5GXj0Wi7XzlaL5qjU/1LP4E5wNY1kMCnwe4QlQVYFREc6a+CYymVxQ
-lr64DYno52B3uiePFsNoT+K67PE5qKDHi1zyyddxt3rgv2exolqifKqjkTwKFII1
-us9B/TdFEWgfNbcDKABRHPzVa1Ac14nSpEOGE9dUgpRxzcfgsL+zi9eIagBn7PRk
-f5zYKZEJAaS4kiz8Y2QFn8twanQu3b6wGcAYErxOWOEwZ/JLg0FHpfEw8AWRsqV4
-dpwstJJYCOVxtwIDAQABo0owSDAnBgNVHREEIDAeghxzdS1jYWwtbmlnaHRseS1h
-cHAxLml0LnN1LnNlMB0GA1UdDgQWBBQDz89CwxmfsQuLbFXdX3McXwNd3jANBgkq
-hkiG9w0BAQUFAAOCAQEAKwRRHK4vHmT4UtiknIvuj8kWaglu3GhQ07kyqrlKi3zF
-2QcH33QgTzmlrbya354/eNpaPUk9xPEUebqp+awcWL1vKejvuW9ZYqK6zaEHnlkC
-HSr/YuL21XsHRCw6Z7+Aez6CvjTSFLUMvmuxhJBgLG7wccvt4n3uYuGQTcStuS8c
-53fqQRqee2V2LLyBwYlgA9+P47VSHHjkM99MJmzpFUsO9vOtp8p3sE0upN3hk/zV
-w1zfPzRsVfUSjKUblBGVNDAZ6yL9i9ZjunCzr3Y+q6dZl6wdNboW0m1L3IOnTyhK
-PuL4GI0NPLrUy5b7LaONfTgL4fQq0t+TQzeU31/zig==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-cal-nightly-app1.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://su-cal-nightly-app1.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://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://su-cal-nightly-app1.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/sympa.lab.it.su.se.xml b/swamid-1.0/sympa.lab.it.su.se.xml
deleted file mode 100644
index c613fc9e..00000000
--- a/swamid-1.0/sympa.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://sympa.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://sympa.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/tomma.it.su.se.xml b/swamid-1.0/tomma.it.su.se.xml
deleted file mode 100644
index 8713e086..00000000
--- a/swamid-1.0/tomma.it.su.se.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tomma.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://tomma.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>tomma.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tomma.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=tomma.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>11560378775330692835</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAKButz8kjR7jMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDnRvbW1hLml0LnN1LnNlMB4XDTA5MDgxNzA4MDgwNVoXDTE5MDgxNTA4MDgw
-NVowGTEXMBUGA1UEAxMOdG9tbWEuaXQuc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDaezrMd5lAc6vT4Oz45aQuoYZVVKcs3/i3DEKs9shDcdRS
-Z1wwH3xw/wacS9uPV2Rm+Z5klXHHkNMJyvph1aP/oHtd2y+Dm2UIM9frACUsuVIz
-qvCBhsY68qGiVWXePkcGl8RGSx3OO0bOGl6o92dSlGlTGpnlypzrurUCYzjIgD0k
-sKB+j9C8OGEb7H1nPfvYmQKDRV3rnh4Kr5+3P/2Hu3eoEE0l2Zw+nlnu4nX6unzm
-JsGer6iV0JVGQ4+T9LkhTVC7tTzD9OoC40vxFU1D1vKcItobgemAzivYlfyJI9nM
-O8+emI5lbbXl7EnAvKpD8nNwFMmA1Ujk1AhjXMshAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDnRvbW1hLml0LnN1LnNlMB0GA1UdDgQWBBTfHsRYudkBhgMun5qWPws8Rd7C
-+TANBgkqhkiG9w0BAQUFAAOCAQEArIbXoSU5a6AceWFi/+/DDSmnwj2gFYSUH6pK
-khAubT4Fma8FaJFb7J45+lfp3eWf7tP4jYufISj/Db2HmuZvrLOSrSAbs9PN0ARr
-bIU69yLCgo8a99xr+j5ZLLvXU8P7aMBLyJDN0oOx3F8dZFQ6yx8k7SD0wXWYUMbY
-6P+Nej0uPSGXXXHs7atN8XgwIwr3/0YjTeK63toWbGwWoKjD0BKpjehGuiq/W1XG
-Ers+pAw7o3166ZmvzYZZ8a0Q/CCMsIdu6PObcBdzsbjvo6u7qg6EFp6oBUV1oe97
-wPSQhrfVNsDC3ssWiiaGgY1Bd+Q6lUyjPqbXD3yB3S73CLfyAA==
-</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>tomma.it.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tomma.it.su.se</ds:X509SubjectName>
-          <ds:X509IssuerSerial>
-            <ds:X509IssuerName>CN=tomma.it.su.se</ds:X509IssuerName>
-            <ds:X509SerialNumber>11560378775330692835</ds:X509SerialNumber>
-          </ds:X509IssuerSerial>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAKButz8kjR7jMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDnRvbW1hLml0LnN1LnNlMB4XDTA5MDgxNzA4MDgwNVoXDTE5MDgxNTA4MDgw
-NVowGTEXMBUGA1UEAxMOdG9tbWEuaXQuc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDaezrMd5lAc6vT4Oz45aQuoYZVVKcs3/i3DEKs9shDcdRS
-Z1wwH3xw/wacS9uPV2Rm+Z5klXHHkNMJyvph1aP/oHtd2y+Dm2UIM9frACUsuVIz
-qvCBhsY68qGiVWXePkcGl8RGSx3OO0bOGl6o92dSlGlTGpnlypzrurUCYzjIgD0k
-sKB+j9C8OGEb7H1nPfvYmQKDRV3rnh4Kr5+3P/2Hu3eoEE0l2Zw+nlnu4nX6unzm
-JsGer6iV0JVGQ4+T9LkhTVC7tTzD9OoC40vxFU1D1vKcItobgemAzivYlfyJI9nM
-O8+emI5lbbXl7EnAvKpD8nNwFMmA1Ujk1AhjXMshAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDnRvbW1hLml0LnN1LnNlMB0GA1UdDgQWBBTfHsRYudkBhgMun5qWPws8Rd7C
-+TANBgkqhkiG9w0BAQUFAAOCAQEArIbXoSU5a6AceWFi/+/DDSmnwj2gFYSUH6pK
-khAubT4Fma8FaJFb7J45+lfp3eWf7tP4jYufISj/Db2HmuZvrLOSrSAbs9PN0ARr
-bIU69yLCgo8a99xr+j5ZLLvXU8P7aMBLyJDN0oOx3F8dZFQ6yx8k7SD0wXWYUMbY
-6P+Nej0uPSGXXXHs7atN8XgwIwr3/0YjTeK63toWbGwWoKjD0BKpjehGuiq/W1XG
-Ers+pAw7o3166ZmvzYZZ8a0Q/CCMsIdu6PObcBdzsbjvo6u7qg6EFp6oBUV1oe97
-wPSQhrfVNsDC3ssWiiaGgY1Bd+Q6lUyjPqbXD3yB3S73CLfyAA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tomma.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tomma.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tomma.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tomma.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tomma.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tomma.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tomma.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tomma.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tomma.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://tomma.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://tomma.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tomma.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tomma.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tomma.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-1.0/tracks.it.su.se.xml b/swamid-1.0/tracks.it.su.se.xml
deleted file mode 100644
index 0bda73de..00000000
--- a/swamid-1.0/tracks.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://tracks.it.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>MIIB3TCCAUagAwIBAgIJAKMNYLPEmQEHMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3RyYWNrcy5pdC5zdS5zZTAeFw0wODA4MDYwODU4MzVaFw0wOTA4MDYwODU4MzVaMBoxGDAWBgNVBAMTD3RyYWNrcy5pdC5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyp8tiALjvVcz8AtTw5lt8CljLmOnCReeZQtm2aGGsgA6mWW3Mf9B14/4EppJ2fpko2CcMihfpy/uiVQ70f8EBJtcH2ugzBpGymYp22taan2SFSmeeC5krk5cro9D9MTtoCWmRARyIqbPpn5beVE2gJDLaFyuDsiX1P2RXzNQTCcCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQCvxq/E3dnnlDsEAZMNTgg1qKgC9EvgCGTSCE/iOXLYLpDczN55HA2nlKG2h7QC/E2Pz0bOny/oVd9qVePgaoukYSSkhgcjz5GufkTHfuOjK9JlrK1cIxk9mZjZaLcYhK4mHf92hMhalIFwRBOvVGZLcbrXic2ceaJkptRV8xCYrw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tracks.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>SU</Company>
-    <GivenName>Leif</GivenName>
-    <SurName>Johansson</SurName>
-    <EmailAddress>leifj@it.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>