SWAMID-973, Borttagning av gamla SP:er från Montania.se

11 files changed, 0 insertions, 503 deletions

diff --git a/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index dcf4b339..00000000
--- a/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-18T11:18:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKltKEoprLKyMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJTRTESMBAGA1UECBMJQmVya3NoaXJlMREwDwYDVQQHEwhIYWxtc3RhZDEbMBkGA1UEChMSTW9udGFuaWEgU3lzdGVtIEFCMR8wHQYDVQQDExZtZWRsZW0uY2hzLmNoYWxtZXJzLnNlMR8wHQYJKoZIhvcNAQkBFhBpbmZvQG1vbnRhbmlhLnNlMB4XDTEzMDExNTEwNDk1OFoXDTIzMDExNTEwNDk1OFowgZMxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlCZXJrc2hpcmUxETAPBgNVBAcTCEhhbG1zdGFkMRswGQYDVQQKExJNb250YW5pYSBTeXN0ZW0gQUIxHzAdBgNVBAMTFm1lZGxlbS5jaHMuY2hhbG1lcnMuc2UxHzAdBgkqhkiG9w0BCQEWEGluZm9AbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxMcNv7MVSA+uOyW0MkqnDs1KAJ5bcScILc/DE9YM4iMc92XeTAlgeLMTMnjXb4tqQ8zRWGEnYvsPfAOvAvQXKZn4D0a4oXLKNTIQkpx8CLU23UZ98MNYfKgMgHNriRj07Dz8lbzDtplwjm0JvlWQyY8NOQsTe0HInG/pFYZSO3wYKDYEJ9ct6vxC1fjwEv9cM+B1WZIcvCMuvYtuDf+gWk5otmhRxKXPFrTN9AoP2UqCDPijYwHdNscOo7wDHoXSrgNncyWeAoFaB08aszclZ5UR06Rx1zhcUkH0mtd/+ZDVURmaGvoui3bfrKP5Mm55K7eUACJTbeCsrxLdV5agDAgMBAAGjgfswgfgwHQYDVR0OBBYEFHUd6+LXVSa4Nnn6n3hDlAvGgqrMMIHIBgNVHSMEgcAwgb2AFHUd6+LXVSa4Nnn6n3hDlAvGgqrMoYGZpIGWMIGTMQswCQYDVQQGEwJTRTESMBAGA1UECBMJQmVya3NoaXJlMREwDwYDVQQHEwhIYWxtc3RhZDEbMBkGA1UEChMSTW9udGFuaWEgU3lzdGVtIEFCMR8wHQYDVQQDExZtZWRsZW0uY2hzLmNoYWxtZXJzLnNlMR8wHQYJKoZIhvcNAQkBFhBpbmZvQG1vbnRhbmlhLnNlggkAqW0oSimssrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAxyG6JskBFzqXI8p1ZGgMIQnpNYUEUkP1kItHyX1MNNyojwUP4WIoJXMYZXzS7idEnFnzXO/CCuU6nOp00LpbSqXVhK9h9vGjk+tM8Qu20J1x2s+z0KOz1lgpXHUGGxSMLBkHuDNnAOMBWpgODA0hplXCQMdu0Vhch6Bk0edh+7rYzGSzLglURU/i0Odta51TiN8MUOMFDR5JtTtQH9jPimq6IhVgQsBR6yhTs5Bjx3alEBVTv5w5RGtl4ROgpU628SOsGKUmUSJ40i4QIfLeJ3MqUBd5ZNSUA6KDFoBCrknlU8VWiSrmv/r1jpIe0AP1mu7//fDesjOVJzgIdnzC5Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKltKEoprLKyMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJTRTESMBAGA1UECBMJQmVya3NoaXJlMREwDwYDVQQHEwhIYWxtc3RhZDEbMBkGA1UEChMSTW9udGFuaWEgU3lzdGVtIEFCMR8wHQYDVQQDExZtZWRsZW0uY2hzLmNoYWxtZXJzLnNlMR8wHQYJKoZIhvcNAQkBFhBpbmZvQG1vbnRhbmlhLnNlMB4XDTEzMDExNTEwNDk1OFoXDTIzMDExNTEwNDk1OFowgZMxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlCZXJrc2hpcmUxETAPBgNVBAcTCEhhbG1zdGFkMRswGQYDVQQKExJNb250YW5pYSBTeXN0ZW0gQUIxHzAdBgNVBAMTFm1lZGxlbS5jaHMuY2hhbG1lcnMuc2UxHzAdBgkqhkiG9w0BCQEWEGluZm9AbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxMcNv7MVSA+uOyW0MkqnDs1KAJ5bcScILc/DE9YM4iMc92XeTAlgeLMTMnjXb4tqQ8zRWGEnYvsPfAOvAvQXKZn4D0a4oXLKNTIQkpx8CLU23UZ98MNYfKgMgHNriRj07Dz8lbzDtplwjm0JvlWQyY8NOQsTe0HInG/pFYZSO3wYKDYEJ9ct6vxC1fjwEv9cM+B1WZIcvCMuvYtuDf+gWk5otmhRxKXPFrTN9AoP2UqCDPijYwHdNscOo7wDHoXSrgNncyWeAoFaB08aszclZ5UR06Rx1zhcUkH0mtd/+ZDVURmaGvoui3bfrKP5Mm55K7eUACJTbeCsrxLdV5agDAgMBAAGjgfswgfgwHQYDVR0OBBYEFHUd6+LXVSa4Nnn6n3hDlAvGgqrMMIHIBgNVHSMEgcAwgb2AFHUd6+LXVSa4Nnn6n3hDlAvGgqrMoYGZpIGWMIGTMQswCQYDVQQGEwJTRTESMBAGA1UECBMJQmVya3NoaXJlMREwDwYDVQQHEwhIYWxtc3RhZDEbMBkGA1UEChMSTW9udGFuaWEgU3lzdGVtIEFCMR8wHQYDVQQDExZtZWRsZW0uY2hzLmNoYWxtZXJzLnNlMR8wHQYJKoZIhvcNAQkBFhBpbmZvQG1vbnRhbmlhLnNlggkAqW0oSimssrIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAxyG6JskBFzqXI8p1ZGgMIQnpNYUEUkP1kItHyX1MNNyojwUP4WIoJXMYZXzS7idEnFnzXO/CCuU6nOp00LpbSqXVhK9h9vGjk+tM8Qu20J1x2s+z0KOz1lgpXHUGGxSMLBkHuDNnAOMBWpgODA0hplXCQMdu0Vhch6Bk0edh+7rYzGSzLglURU/i0Odta51TiN8MUOMFDR5JtTtQH9jPimq6IhVgQsBR6yhTs5Bjx3alEBVTv5w5RGtl4ROgpU628SOsGKUmUSJ40i4QIfLeJ3MqUBd5ZNSUA6KDFoBCrknlU8VWiSrmv/r1jpIe0AP1mu7//fDesjOVJzgIdnzC5Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index 57ac01b6..00000000
--- a/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.consensus.liu.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-07-05T08:26:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för Consensus Linköping</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for Consensus Linköping</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDrDCCApQCCQDMDwvLD8QR3zANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEgMB4GA1UEAwwXbWVkbGVtLmNvbnNlbnN1cy5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTIxOTI2WhcNMjgwNzAzMTIxOTI2WjCBlzELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEgMB4GA1UEAwwXbWVkbGVtLmNvbnNlbnN1cy5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBu9VSSdGpSKvqukGYMhSNTBAB4Cnrq96xX2YaI/CpkBnBzESG5TI7ExRf1ezZZFj629oS6L9oYxJRioG8Nkz/z0K4eoApdLMVomxXkXNx9WgmlB1jPo16kP9m+ZB39A0SsxtrM0M7ooHUY0/35Dl+FzLAX2BrA/zcn3ChJqrC1aaPyLW4H3zlp1VV5Gs/UsRWrLm0mzrwv+M0YyI1sL87vKmKqjzA55QjR567/eU4wWTKBRsWOwtbQei42ef4WICl1U9bKmAviGVucxHO7ZDKEXfMlhnRv/qVWYqJxej0y/olidOEE562VtioQCP/L6CqbHaqYLa8nn1ms+jHL6hNAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACfza86hMDbKnftHXmgwudphMd6eGOAdYJsUmkiPWO+zkUH1C3ZKjOetCAXYBYLZ+W3m5t0vX38J4ye97dJDoCLRg4qNipJ38AdJF+7SJUih8yDnT0IvXk6k3irxdGaq7GujouiR6i52KiObC7RKLviGri2203IZTLkP3Kf1BUSmrlluo8hWHDVf//CGfQnX29h+LWaz5DyEyLgNBjBWx6DO90n423Z2m1f4sdB8ITs1a8EyI3lL8tZTb6xtHWeAiTJV+UHXArODOsgFlvr9Kv7JhiNLyIXXjPoKlF+QRLiGzJq4w/I379gg3OorNhFI73JxTbYgs1QOtVnWmzWojt8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDrDCCApQCCQDMDwvLD8QR3zANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEgMB4GA1UEAwwXbWVkbGVtLmNvbnNlbnN1cy5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTIxOTI2WhcNMjgwNzAzMTIxOTI2WjCBlzELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEgMB4GA1UEAwwXbWVkbGVtLmNvbnNlbnN1cy5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBu9VSSdGpSKvqukGYMhSNTBAB4Cnrq96xX2YaI/CpkBnBzESG5TI7ExRf1ezZZFj629oS6L9oYxJRioG8Nkz/z0K4eoApdLMVomxXkXNx9WgmlB1jPo16kP9m+ZB39A0SsxtrM0M7ooHUY0/35Dl+FzLAX2BrA/zcn3ChJqrC1aaPyLW4H3zlp1VV5Gs/UsRWrLm0mzrwv+M0YyI1sL87vKmKqjzA55QjR567/eU4wWTKBRsWOwtbQei42ef4WICl1U9bKmAviGVucxHO7ZDKEXfMlhnRv/qVWYqJxej0y/olidOEE562VtioQCP/L6CqbHaqYLa8nn1ms+jHL6hNAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACfza86hMDbKnftHXmgwudphMd6eGOAdYJsUmkiPWO+zkUH1C3ZKjOetCAXYBYLZ+W3m5t0vX38J4ye97dJDoCLRg4qNipJ38AdJF+7SJUih8yDnT0IvXk6k3irxdGaq7GujouiR6i52KiObC7RKLviGri2203IZTLkP3Kf1BUSmrlluo8hWHDVf//CGfQnX29h+LWaz5DyEyLgNBjBWx6DO90n423Z2m1f4sdB8ITs1a8EyI3lL8tZTb6xtHWeAiTJV+UHXArODOsgFlvr9Kv7JhiNLyIXXjPoKlF+QRLiGzJq4w/I379gg3OorNhFI73JxTbYgs1QOtVnWmzWojt8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.consensus.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.consensus.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.consensus.liu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.consensus.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.consensus.liu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index 154c3a75..00000000
--- a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-08-20T10:22:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för Konstkåren</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for Konstkåren</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpjCCAo4CCQCprvbR6zSa9zANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTM0MjU5WhcNMjgwNzAzMTM0MjU5WjCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtJGPiSgNlQjOYLC6uzAUhFSv8cqHEKUYbgBRLenLDQzTLqqLiGg64qvl78QzcXYtg5hNaBgb23sweO0LF0pgpPi5N1h9d56vJ6B2gy+b1ZT4izPHFTobKh/W77D5+RIm0uZi09tUCfHLckZgSns7WniW5nplPUEA+C4g2vCbClae/8ApZiCdy9OK2//dW4WgAOJDbJ2WE+DJ3Q6qsideMK3JlpXNxDWLotQqPdYgUIj1dQKQBYwON9KMUdCu1GdIGgb9ura2NDwZeC0OHvQpS12N/Iw965PjJ8NO4CxSrUnOSpZ2fafZ1GCoyWLGyL/taleV2DoG4y+1VGiB1nYx1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF2ryv1lmbPse5e7SbtQfhP9iY/rzZHxYTB4VffyQSPi42EeEfCfGt4itYZe5NRPm8FnVNC5xd5dWPEL3dJvMalBMO5FnEfwzBIC9UEVUoOwcQtt3OLMhlKE784KLjBWFUCbHDnTR6qUBEWJ78eLwr6Dv2M/pvqH5EtG603vExDnLLIS2PAnWlDG0jDcaJiTRq1wH0pXyaqtj0Fx1S0ePPI0YJV59TqBY95f71L7FfegJNiDuN38KloQaTdWdDKM9h5oJrfCHiOBRLnSVs38g8M1gyMvLFxz2b/FUIJZhiDqmFOh0H3YtSeN/Y24yIz1F0dWRmWFNkgXkLJ7C9hSi6A=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpjCCAo4CCQCprvbR6zSa9zANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTM0MjU5WhcNMjgwNzAzMTM0MjU5WjCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtJGPiSgNlQjOYLC6uzAUhFSv8cqHEKUYbgBRLenLDQzTLqqLiGg64qvl78QzcXYtg5hNaBgb23sweO0LF0pgpPi5N1h9d56vJ6B2gy+b1ZT4izPHFTobKh/W77D5+RIm0uZi09tUCfHLckZgSns7WniW5nplPUEA+C4g2vCbClae/8ApZiCdy9OK2//dW4WgAOJDbJ2WE+DJ3Q6qsideMK3JlpXNxDWLotQqPdYgUIj1dQKQBYwON9KMUdCu1GdIGgb9ura2NDwZeC0OHvQpS12N/Iw965PjJ8NO4CxSrUnOSpZ2fafZ1GCoyWLGyL/taleV2DoG4y+1VGiB1nYx1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF2ryv1lmbPse5e7SbtQfhP9iY/rzZHxYTB4VffyQSPi42EeEfCfGt4itYZe5NRPm8FnVNC5xd5dWPEL3dJvMalBMO5FnEfwzBIC9UEVUoOwcQtt3OLMhlKE784KLjBWFUCbHDnTR6qUBEWJ78eLwr6Dv2M/pvqH5EtG603vExDnLLIS2PAnWlDG0jDcaJiTRq1wH0pXyaqtj0Fx1S0ePPI0YJV59TqBY95f71L7FfegJNiDuN38KloQaTdWdDKM9h5oJrfCHiOBRLnSVs38g8M1gyMvLFxz2b/FUIJZhiDqmFOh0H3YtSeN/Y24yIz1F0dWRmWFNkgXkLJ7C9hSi6A=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index 9632ca11..00000000
--- a/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-12-20T12:50:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för Linnéstudenterna</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for Linnéstudenterna</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIECzCCAvOgAwIBAgIJANynfCw436EZMA0GCSqGSIb3DQEBCwUAMIGbMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTEUMBIGA1UEBwwLVsODwqR4asODwrYxHDAaBgNVBAoME0xpbm7Dg8Kpc3R1ZGVudGVybmExIzAhBgNVBAMMGm1lZGxlbS5saW5uZXN0dWRlbnRlcm5hLnNlMScwJQYJKoZIhvcNAQkBFhhpbmZvQGxpbm5lc3R1ZGVudGVybmEuc2UwHhcNMTcwNDIwMDcxMTEwWhcNMjcwNDIwMDcxMTEwWjCBmzELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xFDASBgNVBAcMC1bDg8KkeGrDg8K2MRwwGgYDVQQKDBNMaW5uw4PCqXN0dWRlbnRlcm5hMSMwIQYDVQQDDBptZWRsZW0ubGlubmVzdHVkZW50ZXJuYS5zZTEnMCUGCSqGSIb3DQEJARYYaW5mb0BsaW5uZXN0dWRlbnRlcm5hLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtB2Q2qO/mkcHplmIA5phpDPVx2Sm9MGOGSuCfcrSG8K4FAdAWxa0raYcNG1uRIJaZFR2i0VCeWJFo3e/KTg6MCFf20rJBslbuDq7ggefv59+1vT4JcOptaUnTg/hulxV0PT1UDhXJiAOJlM/bgJGySZMBnsQe9bVB6DdDBzvndRrTdyqx2LhQIQpoJmdV9NvKY1c8i7q1OCAX65XCt933N5SkZbb+Dmbw60Rp4b6P7aqDi9/FCftrjm30t2mloL9ApqnLK2v6eLW9vvU/3/qhWqC6UN6M3lXUWYZSgCSaoGWGmM3R6auDb9tJB+/0xMB1nvl4aafEkfJK8lHoWpaSQIDAQABo1AwTjAdBgNVHQ4EFgQUBWgulnHKfgSYrTUQ+3ehaEnqXFIwHwYDVR0jBBgwFoAUBWgulnHKfgSYrTUQ+3ehaEnqXFIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAgJncatHQ+8XJAfWJqfjVjCbz4ZotPvH8GLK2OzyYKJMffNRo/B+xeOZW2lrd+xkdTDacClsqULS07cOmElqbsEDUTL6ottl57hPdbP+oiPbI0eQAO9mTyXh4XU2U7DyOwWF+xjFkL3q7VkZsLPi6ITjCCNbahEnL4dKtSnGmZa9bMR6XGExoBjY9BhT3dTp8zw3Thzc/UUUq+8rdDLp7o6OWSKIkjzxjuiPdH7qwyVu2Al92syQsNnh/MNJa86uf3hRXHEKVdZcxMZii/QbXtvmuoeHZ3ELt3sP9NL37BqF7GabJSsKRpoIC8fav56nrVE0wISvPmIRifP156xAL4g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIECzCCAvOgAwIBAgIJANynfCw436EZMA0GCSqGSIb3DQEBCwUAMIGbMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTEUMBIGA1UEBwwLVsODwqR4asODwrYxHDAaBgNVBAoME0xpbm7Dg8Kpc3R1ZGVudGVybmExIzAhBgNVBAMMGm1lZGxlbS5saW5uZXN0dWRlbnRlcm5hLnNlMScwJQYJKoZIhvcNAQkBFhhpbmZvQGxpbm5lc3R1ZGVudGVybmEuc2UwHhcNMTcwNDIwMDcxMTEwWhcNMjcwNDIwMDcxMTEwWjCBmzELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xFDASBgNVBAcMC1bDg8KkeGrDg8K2MRwwGgYDVQQKDBNMaW5uw4PCqXN0dWRlbnRlcm5hMSMwIQYDVQQDDBptZWRsZW0ubGlubmVzdHVkZW50ZXJuYS5zZTEnMCUGCSqGSIb3DQEJARYYaW5mb0BsaW5uZXN0dWRlbnRlcm5hLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtB2Q2qO/mkcHplmIA5phpDPVx2Sm9MGOGSuCfcrSG8K4FAdAWxa0raYcNG1uRIJaZFR2i0VCeWJFo3e/KTg6MCFf20rJBslbuDq7ggefv59+1vT4JcOptaUnTg/hulxV0PT1UDhXJiAOJlM/bgJGySZMBnsQe9bVB6DdDBzvndRrTdyqx2LhQIQpoJmdV9NvKY1c8i7q1OCAX65XCt933N5SkZbb+Dmbw60Rp4b6P7aqDi9/FCftrjm30t2mloL9ApqnLK2v6eLW9vvU/3/qhWqC6UN6M3lXUWYZSgCSaoGWGmM3R6auDb9tJB+/0xMB1nvl4aafEkfJK8lHoWpaSQIDAQABo1AwTjAdBgNVHQ4EFgQUBWgulnHKfgSYrTUQ+3ehaEnqXFIwHwYDVR0jBBgwFoAUBWgulnHKfgSYrTUQ+3ehaEnqXFIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAgJncatHQ+8XJAfWJqfjVjCbz4ZotPvH8GLK2OzyYKJMffNRo/B+xeOZW2lrd+xkdTDacClsqULS07cOmElqbsEDUTL6ottl57hPdbP+oiPbI0eQAO9mTyXh4XU2U7DyOwWF+xjFkL3q7VkZsLPi6ITjCCNbahEnL4dKtSnGmZa9bMR6XGExoBjY9BhT3dTp8zw3Thzc/UUUq+8rdDLp7o6OWSKIkjzxjuiPdH7qwyVu2Al92syQsNnh/MNJa86uf3hRXHEKVdZcxMZii/QbXtvmuoeHZ3ELt3sP9NL37BqF7GabJSsKRpoIC8fav56nrVE0wISvPmIRifP156xAL4g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index 8662a393..00000000
--- a/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-07-05T08:26:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för Linköpings teknologers studentkår</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for Linköping Union of Technology and Science Students</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDvjCCAqYCCQChX/KBdFYWXTANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmxpbnRlay5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTE1ODU1WhcNMjgwNzAzMTE1ODU1WjCBoDELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmxpbnRlay5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUSflkj4/v3zciaRRGV88x81tuYumdPZETLOqjWhm7b/eDiTJ8MFcmNtjHW7VEZFGSqwE3iL4Zeu6C7CJQ1HUhNjiSATrapknwNUJ7amBiqMlPymF23OSfP49dN3bnwD3+rwf9g7KCNWe6OUEX+2rg+JGm3nYGODqaEJPyjvwdZO3ZubJlYNeb0RuTYy/LVHMvlVmC2ro4nGC40MEgu0ZABzeUGNmmTZGdC6Gcw3uecTfMeHPz7PtY3JBvU1HBqjel6LIB4OY6QdwmASmfr4ypcjgLqPS7VdPbVkWgyiL766oZGW0UKp03IrxkT93CLoZqTQJkSo5+W2k6cvGa3n95AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKaDARKMMuzNA4fROSv07ZFq+TvasLI0Psc7vqcv2zwtcAsmQw940X94v202Y2+r6Om1ZPHPqXMNjFPBAJWqFb1YOceX+XAQvunT3WUfohqlZQyVDlyRmBwzJSgPTo5Tg5qeiDR6/h1YASRaJfdDY4h0VjnBvEpoYCd2fj6qBWJ10KmFdkTo3sA+7e4tOO1Z6s/E/EWt39DA3Nq0JBkB4Jgspl7njcsytDGVzaN4eravKLvLdsbm/W5b56V8f1hL3XLQ3WIAAx7lyVTAU8i1uAOvrxycMPR+HfCS9rD2MVjWmbsiZdDBzbenqdXdR2av5E0czXVzuj5Pav8pqkxOFLY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDvjCCAqYCCQChX/KBdFYWXTANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmxpbnRlay5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTE1ODU1WhcNMjgwNzAzMTE1ODU1WjCBoDELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmxpbnRlay5saXUuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUSflkj4/v3zciaRRGV88x81tuYumdPZETLOqjWhm7b/eDiTJ8MFcmNtjHW7VEZFGSqwE3iL4Zeu6C7CJQ1HUhNjiSATrapknwNUJ7amBiqMlPymF23OSfP49dN3bnwD3+rwf9g7KCNWe6OUEX+2rg+JGm3nYGODqaEJPyjvwdZO3ZubJlYNeb0RuTYy/LVHMvlVmC2ro4nGC40MEgu0ZABzeUGNmmTZGdC6Gcw3uecTfMeHPz7PtY3JBvU1HBqjel6LIB4OY6QdwmASmfr4ypcjgLqPS7VdPbVkWgyiL766oZGW0UKp03IrxkT93CLoZqTQJkSo5+W2k6cvGa3n95AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKaDARKMMuzNA4fROSv07ZFq+TvasLI0Psc7vqcv2zwtcAsmQw940X94v202Y2+r6Om1ZPHPqXMNjFPBAJWqFb1YOceX+XAQvunT3WUfohqlZQyVDlyRmBwzJSgPTo5Tg5qeiDR6/h1YASRaJfdDY4h0VjnBvEpoYCd2fj6qBWJ10KmFdkTo3sA+7e4tOO1Z6s/E/EWt39DA3Nq0JBkB4Jgspl7njcsytDGVzaN4eravKLvLdsbm/W5b56V8f1hL3XLQ3WIAAx7lyVTAU8i1uAOvrxycMPR+HfCS9rD2MVjWmbsiZdDBzbenqdXdR2av5E0czXVzuj5Pav8pqkxOFLY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.ntk.umu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.ntk.umu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index f098f2ed..00000000
--- a/swamid-2.0/medlem.ntk.umu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.ntk.umu.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-01-04T10:28:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Umeå naturvetar- och teknologkårs medlemsportal</mdui:Description>
-        <mdui:Description xml:lang="en">Member portal of Umeå Student Union of Science and Technology</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://medlem.ntk.umu.se/?setlanguage=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://medlem.ntk.umu.se/?setlanguage=en</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEXjCCAsYCCQDvHhmCw7K2EDANBgkqhkiG9w0BAQsFADBxMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEmMCQGCSqGSIb3DQEJARYXbWVkbGVtLXNhbWxAbW9udGFuaWEuc2UwHhcNMjAxMjI4MTU1NzAxWhcNMzAxMjI4MTU1NzAxWjBxMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEmMCQGCSqGSIb3DQEJARYXbWVkbGVtLXNhbWxAbW9udGFuaWEuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDzlAFUZ2qQztJF1b5RPB4n2h81NRt785k2G60CxSmdqCU/m0b39WfUxh4tGtJO3/WGr/8dWkG2b6M3WkoB+9UTJ1uXHDrzm5wO/yyorScDRd5D0sXhwKgY3wYg/3+Nr/hdDnztav5oj31PVHwjjEnozNWkHes0SGu09mKCX8LFE+7i7lDGAmLJughFRTErj8o2JgwJT+wRSkvFVCliPv+w+azCNEQ3kXsvt4Pjr54goh8yx9FLLevKFDy7PixtLL9mmWAIx0IqqCH50tMi2FZWCyADGJxYYU5EfhFkGu7ZqZ8rSdZ/NIXEZT6IIomsV+sIBWrFISarOqs/E1wB69c185KbVXOymBEEsjyV/7FVWZ+Vqh7ai1LKnHaGYI+vKCrQ6umanjCs4734XTptbw/yk07V0K4ugQ+m99XCg4Bz3nZo8/VIi5jARVJEkVHZUR+NXpziZTg5/XZ/AARLCh05oSbzxj5jQPmbKi5nGqFERguTHiJKN1esp5a6FLro3SsCAwEAATANBgkqhkiG9w0BAQsFAAOCAYEAeH0QeqO+MA+Ci9YOLjNSR8EgiITQWrbErttlQi0vuJzIDLI3GJTjvgICufIu05kwonQ4PBi9hEaGKtN6WQFC18feSQwa7njYPIg/hM5vRixhOKovB49mPn6bfp9RAcSbJ6on4dD7SkWCKx4CgI8g8G8GhqU9Sn8GWzlRhxtfhIt2A97T10mbGaZs07LEirurTuU6gjZgqPOCbFVZ+r+wFeu2Em4x1tSDBKia/VBLvja0S5U/L0VHNtLgYWQN3dG0kgdm6QOxOPbKkosHwwaewdO1LRlZprjRWQvOsEAUGc3VHXHycdTbGFo7NMmzslbq+3pVvjuAH4s0kn+JuP9gqRrnkqWMegVb1ZRNbpuak8dgmj1JvoppseM7xESgNECZ3+pfRuAUH2t0ORdAPrKp5oBHQkNy/S/84L4DWJqNI93HqfKhqR44Og1zNP3QMO9nWuMIDw7jysv/T4wh41k2JrKA3Ktp20cT3ncX3GIgiodO9797cWR/iWUJFKaue91/</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEXjCCAsYCCQDvHhmCw7K2EDANBgkqhkiG9w0BAQsFADBxMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEmMCQGCSqGSIb3DQEJARYXbWVkbGVtLXNhbWxAbW9udGFuaWEuc2UwHhcNMjAxMjI4MTU1NzAxWhcNMzAxMjI4MTU1NzAxWjBxMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEmMCQGCSqGSIb3DQEJARYXbWVkbGVtLXNhbWxAbW9udGFuaWEuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDzlAFUZ2qQztJF1b5RPB4n2h81NRt785k2G60CxSmdqCU/m0b39WfUxh4tGtJO3/WGr/8dWkG2b6M3WkoB+9UTJ1uXHDrzm5wO/yyorScDRd5D0sXhwKgY3wYg/3+Nr/hdDnztav5oj31PVHwjjEnozNWkHes0SGu09mKCX8LFE+7i7lDGAmLJughFRTErj8o2JgwJT+wRSkvFVCliPv+w+azCNEQ3kXsvt4Pjr54goh8yx9FLLevKFDy7PixtLL9mmWAIx0IqqCH50tMi2FZWCyADGJxYYU5EfhFkGu7ZqZ8rSdZ/NIXEZT6IIomsV+sIBWrFISarOqs/E1wB69c185KbVXOymBEEsjyV/7FVWZ+Vqh7ai1LKnHaGYI+vKCrQ6umanjCs4734XTptbw/yk07V0K4ugQ+m99XCg4Bz3nZo8/VIi5jARVJEkVHZUR+NXpziZTg5/XZ/AARLCh05oSbzxj5jQPmbKi5nGqFERguTHiJKN1esp5a6FLro3SsCAwEAATANBgkqhkiG9w0BAQsFAAOCAYEAeH0QeqO+MA+Ci9YOLjNSR8EgiITQWrbErttlQi0vuJzIDLI3GJTjvgICufIu05kwonQ4PBi9hEaGKtN6WQFC18feSQwa7njYPIg/hM5vRixhOKovB49mPn6bfp9RAcSbJ6on4dD7SkWCKx4CgI8g8G8GhqU9Sn8GWzlRhxtfhIt2A97T10mbGaZs07LEirurTuU6gjZgqPOCbFVZ+r+wFeu2Em4x1tSDBKia/VBLvja0S5U/L0VHNtLgYWQN3dG0kgdm6QOxOPbKkosHwwaewdO1LRlZprjRWQvOsEAUGc3VHXHycdTbGFo7NMmzslbq+3pVvjuAH4s0kn+JuP9gqRrnkqWMegVb1ZRNbpuak8dgmj1JvoppseM7xESgNECZ3+pfRuAUH2t0ORdAPrKp5oBHQkNy/S/84L4DWJqNI93HqfKhqR44Og1zNP3QMO9nWuMIDw7jysv/T4wh41k2JrKA3Ktp20cT3ncX3GIgiodO9797cWR/iWUJFKaue91/</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.ntk.umu.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.ntk.umu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.ntk.umu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.ntk.umu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.ntk.umu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">AgeraMedlem</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Montania System AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Montania System AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Montania System AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Montania System AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.montania.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.montania.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Medlem</md:SurName>
-    <md:EmailAddress>mailto:medlem@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:medlem-saml@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index edeb1ec2..00000000
--- a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-19T15:00:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för Studentkåren i Borås</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for Borås Student Union</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAN2u8Hhf8Mr2MA0GCSqGSIb3DQEBBQUAMIGeMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEKMAgGA1UECwwBLTElMCMGA1UEAwwcbWVkbGVtLnN0dWRlbnRrYXJlbmlib3Jhcy5zZTEgMB4GCSqGSIb3DQEJARYRam9oYW5AbW9udGFuaWEuc2UwHhcNMTMwNjE0MTMyODQyWhcNMjMwNjE0MTMyODQyWjCBnjELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxCjAIBgNVBAsMAS0xJTAjBgNVBAMMHG1lZGxlbS5zdHVkZW50a2FyZW5pYm9yYXMuc2UxIDAeBgkqhkiG9w0BCQEWEWpvaGFuQG1vbnRhbmlhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzD70ltiDLf7KOMs+B1HPuMmC4MgEBPdLBxa2GLaYPnRmSm0NM5FIl6o72N+2PXnPqR1sVp4pWr6xk1nKhh73S3WUCIAiSHsGL6Xea7DEgtJ0sIw5QSqZ4rgA+2xBS7hb7A1WjAfFH0fxw3bgpg9gVpEzbgZNJYkbgwkD5JrFKfQv1GPMz4Lf8gph+t4ky+oFWjnyTjIqpTM71OPzSpvOkG8sOatUwCqnbGFJti0e+IDDTCkLZJAybLrxa99FYRLNfEkIbK3KiSxSOIMMJ49iXisAoIOSFqVeGcf+I6caVnVQTfKzxpHUFauYAtYhypvYQzUeVYZF1KVkth75lrzIwwIDAQABo1AwTjAdBgNVHQ4EFgQUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwHwYDVR0jBBgwFoAUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAycydQTVP61CvGXzkbP4hEuDGVAlfTY4l3jp970aWAMQOQTVAevJnSDXDq++7weohqmC21lJjNlv0TvdrgqQGpF+pKdR0DRnYyLg87/idUhOvU+h5bJy6O/rz94VK1/G7lc/TSZ2B8KIcQRB7fcyquwKR9v5pulYijxM21Qj/QBu0sxUqMJ2px4vh2ct86p6z54qQiN0xbVPGbjDYT7ITjE5pCUu/BdQfN0/1CwimhUxcf+R/4l8ZJVIE9G+QRdV1mhYglX3MlYfFsf6hovTe4ZWWV07023D1iC+JxctCb2jDJQoxPDAo1jxSFVydyHor9SeMdkw7gx7mqQWNDBqj9w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAN2u8Hhf8Mr2MA0GCSqGSIb3DQEBBQUAMIGeMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEKMAgGA1UECwwBLTElMCMGA1UEAwwcbWVkbGVtLnN0dWRlbnRrYXJlbmlib3Jhcy5zZTEgMB4GCSqGSIb3DQEJARYRam9oYW5AbW9udGFuaWEuc2UwHhcNMTMwNjE0MTMyODQyWhcNMjMwNjE0MTMyODQyWjCBnjELMAkGA1UEBhMCU0UxCjAIBgNVBAgMAS0xETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxCjAIBgNVBAsMAS0xJTAjBgNVBAMMHG1lZGxlbS5zdHVkZW50a2FyZW5pYm9yYXMuc2UxIDAeBgkqhkiG9w0BCQEWEWpvaGFuQG1vbnRhbmlhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzD70ltiDLf7KOMs+B1HPuMmC4MgEBPdLBxa2GLaYPnRmSm0NM5FIl6o72N+2PXnPqR1sVp4pWr6xk1nKhh73S3WUCIAiSHsGL6Xea7DEgtJ0sIw5QSqZ4rgA+2xBS7hb7A1WjAfFH0fxw3bgpg9gVpEzbgZNJYkbgwkD5JrFKfQv1GPMz4Lf8gph+t4ky+oFWjnyTjIqpTM71OPzSpvOkG8sOatUwCqnbGFJti0e+IDDTCkLZJAybLrxa99FYRLNfEkIbK3KiSxSOIMMJ49iXisAoIOSFqVeGcf+I6caVnVQTfKzxpHUFauYAtYhypvYQzUeVYZF1KVkth75lrzIwwIDAQABo1AwTjAdBgNVHQ4EFgQUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwHwYDVR0jBBgwFoAUlgZV0Hyq7sLEJjVuQTvoAvDfUsYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAycydQTVP61CvGXzkbP4hEuDGVAlfTY4l3jp970aWAMQOQTVAevJnSDXDq++7weohqmC21lJjNlv0TvdrgqQGpF+pKdR0DRnYyLg87/idUhOvU+h5bJy6O/rz94VK1/G7lc/TSZ2B8KIcQRB7fcyquwKR9v5pulYijxM21Qj/QBu0sxUqMJ2px4vh2ct86p6z54qQiN0xbVPGbjDYT7ITjE5pCUu/BdQfN0/1CwimhUxcf+R/4l8ZJVIE9G+QRdV1mhYglX3MlYfFsf6hovTe4ZWWV07023D1iC+JxctCb2jDJQoxPDAo1jxSFVydyHor9SeMdkw7gx7mqQWNDBqj9w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index 8b86bc9b..00000000
--- a/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.stuff.liu.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-07-05T08:26:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för StuFF</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for StuFF</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpDCCAowCCQDTYedhFyC/YjANBgkqhkiG9w0BAQsFADCBkzELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEcMBoGA1UEAwwTbWVkbGVtLnN0dWZmLmxpdS5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTAeFw0xODA3MDQxMjEzMDFaFw0yODA3MDMxMjEzMDFaMIGTMQswCQYDVQQGEwJTRTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEVMBMGA1UECwwMQWdlcmEgTWVkbGVtMRwwGgYDVQQDDBNtZWRsZW0uc3R1ZmYubGl1LnNlMR8wHQYJKoZIhvcNAQkBFhB3ZWJiQG1vbnRhbmlhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwQoJmAJhgqKSS0MzTeeHeE56i04rUEddn9tu/x5F6boC+ggG14UnPUbXhCfo9ZjDHQO28+yCWdRhfWAmvCWfmKkhSx4CpgfE9Yn6mw8+CrssfUUUAkzvqddc7a3ZjL7LPmSntWi3zQE0fzUQv7X4YOzMc9mVQ2TMzy4aKhwGS6ib41m8T4AGRwUEZFbKMt+wDq3YslBfcTTQyc62cRGl3xNsc+Z39Pa43Sb6bqjc9IClpjHObXxRyUpnq2eRg6GRE8yR0wXQG4kwZZAZ/jXS5Mp7xMuCID6qFiNGC+c5AUhCJ8iLmqF+0wmgJq11MeNcng0LtFWNW6VDwlWqtTEdDQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAid7qCYqN9v+CrkPEIUUgSpUiqi+38KasiemtdjbcHL7qSqFjv+KpS5DSvSu+PWsr4q4unHtzzAl08HcKwr8xOab3w1t/qq20cocyPCD+nSJIbtc8kWF7hjj+R6DUFVxe9dK05GUAB7QQHovYIaKKQCyLcPwFJk+u2CK/rLfcQOI7tLmd/nUX+4AbEMa0hdETGJ4Ahfp9lP7PdxAmBmR2WWa5gdga9C8dwuLphzeJtEdXpVBiyocfeUZB8mHNExRezzjFVp/K5QfHnXeTGO6CNrdX4F41BASRmCPTMQYTjFcMfRGpmJIdF4qCloFubbPEXSnGi909x2gdYyH6p3LFz</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpDCCAowCCQDTYedhFyC/YjANBgkqhkiG9w0BAQsFADCBkzELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEcMBoGA1UEAwwTbWVkbGVtLnN0dWZmLmxpdS5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTAeFw0xODA3MDQxMjEzMDFaFw0yODA3MDMxMjEzMDFaMIGTMQswCQYDVQQGEwJTRTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEVMBMGA1UECwwMQWdlcmEgTWVkbGVtMRwwGgYDVQQDDBNtZWRsZW0uc3R1ZmYubGl1LnNlMR8wHQYJKoZIhvcNAQkBFhB3ZWJiQG1vbnRhbmlhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwQoJmAJhgqKSS0MzTeeHeE56i04rUEddn9tu/x5F6boC+ggG14UnPUbXhCfo9ZjDHQO28+yCWdRhfWAmvCWfmKkhSx4CpgfE9Yn6mw8+CrssfUUUAkzvqddc7a3ZjL7LPmSntWi3zQE0fzUQv7X4YOzMc9mVQ2TMzy4aKhwGS6ib41m8T4AGRwUEZFbKMt+wDq3YslBfcTTQyc62cRGl3xNsc+Z39Pa43Sb6bqjc9IClpjHObXxRyUpnq2eRg6GRE8yR0wXQG4kwZZAZ/jXS5Mp7xMuCID6qFiNGC+c5AUhCJ8iLmqF+0wmgJq11MeNcng0LtFWNW6VDwlWqtTEdDQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAid7qCYqN9v+CrkPEIUUgSpUiqi+38KasiemtdjbcHL7qSqFjv+KpS5DSvSu+PWsr4q4unHtzzAl08HcKwr8xOab3w1t/qq20cocyPCD+nSJIbtc8kWF7hjj+R6DUFVxe9dK05GUAB7QQHovYIaKKQCyLcPwFJk+u2CK/rLfcQOI7tLmd/nUX+4AbEMa0hdETGJ4Ahfp9lP7PdxAmBmR2WWa5gdga9C8dwuLphzeJtEdXpVBiyocfeUZB8mHNExRezzjFVp/K5QfHnXeTGO6CNrdX4F41BASRmCPTMQYTjFcMfRGpmJIdF4qCloFubbPEXSnGi909x2gdYyH6p3LFz</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.stuff.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.stuff.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.stuff.liu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.stuff.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.stuff.liu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index 28289114..00000000
--- a/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.sus.su.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-09T10:06:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för Stockholms universitets studentkår</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for Stockholm University Student Union</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAKaWfm0+k7wbMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEZMBcGA1UEAwwQbWVkbGVtLnN1cy5zdS5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTAeFw0xODA0MDYxNTEyMTlaFw0yODA0MDUxNTEyMTlaMIGFMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEZMBcGA1UEAwwQbWVkbGVtLnN1cy5zdS5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL36Ui22PwS8AlsVk3u136WzwrUm/b0FGCZUsh9Z3OmbyioFOj9Z/fHlN1U4uCJGriqPIahzdWkPXERjGeEavXxIl/oPiEqkinFi2ZF5edWFnYzSIY1QIA1UHSR/J+norrQFoSMP9RiGDK/quWgUjGIZxTxpkb3WpZ5gBKfmy3EBk00rpwF2ybzk/HYrpwzb5IKKoqg8GOkdxE2tHgpGUGG/7uotF/KOFw+2EoqW1daIlUiMrfe93+4yxudIA8UbVRb+oGio4L9m8m38AoA/CfwHldRzG8Ho1+8LDfUjv39XPfo3NzZScymp7uJTOphs0sFffoM56L1rD2tKK6vRBpsCAwEAAaNQME4wHQYDVR0OBBYEFN/yv4Tf8i8IEptvXYfGZ8ru6tzoMB8GA1UdIwQYMBaAFN/yv4Tf8i8IEptvXYfGZ8ru6tzoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBALKzCPl7U5/prBtbHvxzQ544tmBrsL1KWOp8QxplfT07Y4rT71FFcvkWwXBxxgy71h1iYHF2UASWiON9ZmXj25cXq9wu0T303zbru8v3aspfQa3x2Ve/+VNkjDVD9ZFjuPGy2SXCGlAq5tu2pWkBGA23YAWPlr/MctgjZKcIg15DYWqgb9RtV9YGGvROmH9IMaGu8vteDzCn4cfE3slgzB4n91fV+CEv1XZdLmgVLFZGzfyU9WKPObmDRThc7zlv+boo2k3CKVrDiUb8Qv1HBzDZG2iWNqPPKuDA1Kb7N0+ozdGDPDkyDI4vZR3yaPnol89++D4DXYa4zRm2jGE7xAI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAKaWfm0+k7wbMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEZMBcGA1UEAwwQbWVkbGVtLnN1cy5zdS5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTAeFw0xODA0MDYxNTEyMTlaFw0yODA0MDUxNTEyMTlaMIGFMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBLTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEZMBcGA1UEAwwQbWVkbGVtLnN1cy5zdS5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL36Ui22PwS8AlsVk3u136WzwrUm/b0FGCZUsh9Z3OmbyioFOj9Z/fHlN1U4uCJGriqPIahzdWkPXERjGeEavXxIl/oPiEqkinFi2ZF5edWFnYzSIY1QIA1UHSR/J+norrQFoSMP9RiGDK/quWgUjGIZxTxpkb3WpZ5gBKfmy3EBk00rpwF2ybzk/HYrpwzb5IKKoqg8GOkdxE2tHgpGUGG/7uotF/KOFw+2EoqW1daIlUiMrfe93+4yxudIA8UbVRb+oGio4L9m8m38AoA/CfwHldRzG8Ho1+8LDfUjv39XPfo3NzZScymp7uJTOphs0sFffoM56L1rD2tKK6vRBpsCAwEAAaNQME4wHQYDVR0OBBYEFN/yv4Tf8i8IEptvXYfGZ8ru6tzoMB8GA1UdIwQYMBaAFN/yv4Tf8i8IEptvXYfGZ8ru6tzoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBALKzCPl7U5/prBtbHvxzQ544tmBrsL1KWOp8QxplfT07Y4rT71FFcvkWwXBxxgy71h1iYHF2UASWiON9ZmXj25cXq9wu0T303zbru8v3aspfQa3x2Ve/+VNkjDVD9ZFjuPGy2SXCGlAq5tu2pWkBGA23YAWPlr/MctgjZKcIg15DYWqgb9RtV9YGGvROmH9IMaGu8vteDzCn4cfE3slgzB4n91fV+CEv1XZdLmgVLFZGzfyU9WKPObmDRThc7zlv+boo2k3CKVrDiUb8Qv1HBzDZG2iWNqPPKuDA1Kb7N0+ozdGDPDkyDI4vZR3yaPnol89++D4DXYa4zRm2jGE7xAI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.sus.su.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.sus.su.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.sus.su.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.sus.su.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.sus.su.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index 38e6c6cb..00000000
--- a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-16T11:08:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv"> 
-   Medlemsportalen 
-    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en"> 
-      Member Portal 
-       </mdui:DisplayName>
-        <mdui:Description xml:lang="sv"> 
-	 Medlemsportalen för Medicinska Föreningen i Stockholm 
-	  </mdui:Description>
-        <mdui:Description xml:lang="en"> 
-	    Member Portal for Medical Students' Association in Stockholm 
-	     </mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJAOQeDIWAShseMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAlNFMQowCAYDVQQIDAEtMSEwHwYDVQQKDBhNZWRpY2luc2thIEbDg8K2cmVuaW5nZW4xJzAlBgNVBAMMHnBvcnRhbC5tZWRpY2luc2thZm9yZW5pbmdlbi5zZTAeFw0xMzA4MDkwODQzMDZaFw0yMzA4MDkwODQzMDZaMGUxCzAJBgNVBAYTAlNFMQowCAYDVQQIDAEtMSEwHwYDVQQKDBhNZWRpY2luc2thIEbDg8K2cmVuaW5nZW4xJzAlBgNVBAMMHnBvcnRhbC5tZWRpY2luc2thZm9yZW5pbmdlbi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMpp5RJmeKMfNouG1cFRjP4UMrhsOUXE1FlRCZ8WJqX8Oi5RT5MIPuYvkiPnfOJWRIB+OaMdaTYUvf+ELJFdCKCd8KLTj/8briAtNkh6ZxliRfR/kwGCqngbBYCMuheWjasyldJHgHsfnkhLCT7A1VNUDl9pxcVh6LlK55WnTYwULTNvr3xqCTs/gYRfepztYfDJbNKAIRvOXvhQbfu9iCWlZtKtHmnMrqiBz/Z1An4+GFyd8XTyFkVHyuiYRxDtQ8+eatfeStVbizTVgVC5ZAmiMq5pfPCyDBe/5O1yj3hycQyFPLD1q6peuu7mUfE9rJLrBz6ZWbXm71Di0FsWpL0CAwEAAaNQME4wHQYDVR0OBBYEFLfT26XWwB2cPQmyVM0WjjCB12AgMB8GA1UdIwQYMBaAFLfT26XWwB2cPQmyVM0WjjCB12AgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAC212SCWgDmhYlY8ZVQ7daRwG1vlqlvJHXZTLb02ZB/MR7bfys02czjcUfNpDC06WrOXQuOVlxWOxey+66sjlC9E6V4613krYsSfZUwV7z0pQ8I2PXgUC8A5kmRDpC6bdl/MwiszgwYEm6KU+xm4M8e4g2h4pj3uieWXIGHvtnQjA5dUkQondVDZRs4g3ufffsbpRBopK8mxZrLhOmaKRgZw7eo4qUviIu0+gPBnMGwxYzqj3sxjfMUK7edkH6SCbbkI/BAghi/CfFHocHREK00O2TaemfSY9WgOX8b+NV1PoyJ71T/aeRBNiGifIYqkRhoRyc1XOnov9t9RwN3VsUk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJAOQeDIWAShseMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAlNFMQowCAYDVQQIDAEtMSEwHwYDVQQKDBhNZWRpY2luc2thIEbDg8K2cmVuaW5nZW4xJzAlBgNVBAMMHnBvcnRhbC5tZWRpY2luc2thZm9yZW5pbmdlbi5zZTAeFw0xMzA4MDkwODQzMDZaFw0yMzA4MDkwODQzMDZaMGUxCzAJBgNVBAYTAlNFMQowCAYDVQQIDAEtMSEwHwYDVQQKDBhNZWRpY2luc2thIEbDg8K2cmVuaW5nZW4xJzAlBgNVBAMMHnBvcnRhbC5tZWRpY2luc2thZm9yZW5pbmdlbi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMpp5RJmeKMfNouG1cFRjP4UMrhsOUXE1FlRCZ8WJqX8Oi5RT5MIPuYvkiPnfOJWRIB+OaMdaTYUvf+ELJFdCKCd8KLTj/8briAtNkh6ZxliRfR/kwGCqngbBYCMuheWjasyldJHgHsfnkhLCT7A1VNUDl9pxcVh6LlK55WnTYwULTNvr3xqCTs/gYRfepztYfDJbNKAIRvOXvhQbfu9iCWlZtKtHmnMrqiBz/Z1An4+GFyd8XTyFkVHyuiYRxDtQ8+eatfeStVbizTVgVC5ZAmiMq5pfPCyDBe/5O1yj3hycQyFPLD1q6peuu7mUfE9rJLrBz6ZWbXm71Di0FsWpL0CAwEAAaNQME4wHQYDVR0OBBYEFLfT26XWwB2cPQmyVM0WjjCB12AgMB8GA1UdIwQYMBaAFLfT26XWwB2cPQmyVM0WjjCB12AgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAC212SCWgDmhYlY8ZVQ7daRwG1vlqlvJHXZTLb02ZB/MR7bfys02czjcUfNpDC06WrOXQuOVlxWOxey+66sjlC9E6V4613krYsSfZUwV7z0pQ8I2PXgUC8A5kmRDpC6bdl/MwiszgwYEm6KU+xm4M8e4g2h4pj3uieWXIGHvtnQjA5dUkQondVDZRs4g3ufffsbpRBopK8mxZrLhOmaKRgZw7eo4qUviIu0+gPBnMGwxYzqj3sxjfMUK7edkH6SCbbkI/BAghi/CfFHocHREK00O2TaemfSY9WgOX8b+NV1PoyJ71T/aeRBNiGifIYqkRhoRyc1XOnov9t9RwN3VsUk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index aef1dc14..22156696 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -27,7 +27,6 @@
   <xi:include href="swamid-2.0/expert.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/www.universityadmissions.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.chalmersstudentkar.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.consensus.liu.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.disk.su.se-auth-saml-metadata.xml"/>
@@ -37,14 +36,12 @@
   <xi:include href="swamid-2.0/medlem.linnek.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.ntk.umu.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.saks.se-auth-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.stuff.liu.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.sus.su.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.tlth.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/confluence.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-employee-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>
   <xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
@@ -287,7 +284,6 @@
   <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.ki.se.xml"/>
-  <xi:include href="swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/video.nordu.net.xml"/>
   <xi:include href="swamid-2.0/www.test.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/expert.test.antagning.se-ecs-sp.xml"/>
@@ -384,7 +380,6 @@
   <xi:include href="swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml"/>
-  <xi:include href="swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/play.test.umu.se.xml"/>
   <xi:include href="swamid-2.0/portalfhs.onricoh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hh.hr.evry.se-shibboleth.xml"/>
@@ -405,10 +400,6 @@
   <xi:include href="swamid-2.0/lubcat.lub.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.shh.se.xml"/>
   <xi:include href="swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml"/>
-  <xi:include href="swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
-  <xi:include href="swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
-  <xi:include href="swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
-  <xi:include href="swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/koha-test.lub.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/primula.lnu.se-shibboleth.xml"/>
@@ -574,7 +565,6 @@
   <xi:include href="swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/www.service4mobility.com-mobility_su_se.xml"/>
-  <xi:include href="swamid-2.0/medlem.ntk.umu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/drive-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/primula.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/assemblage.dc.kau.se.xml"/>