Moved SP:s into FIDUS

8 files changed, 0 insertions, 478 deletions

diff --git a/swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
deleted file mode 100644
index e498bab0..00000000
--- a/swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://am-sso-int.skol.sonet.net.au/module.php/saml/sp/metadata.php/sp1">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-13T14:57:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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="en">Skolverket Assessment Master</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
-        <mdui:Logo xml:lang="en" width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://am-sso-int.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://am-sso-int.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://am-sso-int.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://am-sso-int.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://am-sso-int.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://am-sso-int.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>SoNET Systems</md:Company>
-    <md:GivenName>Software</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
deleted file mode 100644
index 956677b4..00000000
--- a/swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://am-sso-uat.skol.sonet.net.au/module.php/saml/sp/metadata.php/sp1">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-12-21T18:05:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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="en">Skolverket Assessment Master</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
-        <mdui:Logo xml:lang="en" width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://am-sso-uat.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://am-sso-uat.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://am-sso-uat.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://am-sso-uat.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://am-sso-uat.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://am-sso-uat.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>SoNET Systems</md:Company>
-    <md:GivenName>Software</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
deleted file mode 100644
index 523db68c..00000000
--- a/swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://am-sso-utb.skol.sonet.net.au/module.php/saml/sp/metadata.php/sp1">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-13T14:57:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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="en">Skolverket Assessment Master</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
-        <mdui:Logo xml:lang="en" width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://am-sso-utb.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://am-sso-utb.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://am-sso-utb.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://am-sso-utb.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://am-sso-utb.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://am-sso-utb.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>SoNET Systems</md:Company>
-    <md:GivenName>Software</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
deleted file mode 100644
index b405b8c8..00000000
--- a/swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://am-sso.skol.sonet.net.au/module.php/saml/sp/metadata.php/sp1">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-12-21T18:05:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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="en">Skolverket Assessment Master</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
-        <mdui:Logo xml:lang="en" width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://am-sso.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://am-sso.skol.sonet.net.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://am-sso.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://am-sso.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://am-sso.skol.sonet.net.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://am-sso.skol.sonet.net.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>SoNET Systems</md:Company>
-    <md:GivenName>Software</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/fidustest.skolverket.se-shibboleth.xml b/swamid-2.0/fidustest.skolverket.se-shibboleth.xml
deleted file mode 100644
index ae799a53..00000000
--- a/swamid-2.0/fidustest.skolverket.se-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://fidustest.skolverket.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-09T11:22:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <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">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://fidustest.skolverket.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fidustest.skolverket.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>fidustest.skolverket.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=fidustest.skolverket.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEFzCCAn+gAwIBAgIUBVCOZcU+Y/hlq6kUjFyREaALzZQwDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAxMXZmlkdXN0ZXN0LnNrb2x2ZXJrZXQuc2UwHhcNMjAwMjE5
-MDkzMTE2WhcNMzAwMjE2MDkzMTE2WjAiMSAwHgYDVQQDExdmaWR1c3Rlc3Quc2tv
-bHZlcmtldC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKBPt5rG
-NNIiKwB+wY8ieW9ra49a75Eu1yBsWNWgYJKA/NaxG36zvnsKxf6eoPvWg9g21vr2
-+tc3k0ugEg3wm94mvt3w0DogbkADjkUsjdBUEfkNwDUlvFZivZzICB535RMY5Iff
-iQZTyTz4MXwBAs5evnF8hNjGcFH7iJfaUOzv3bmO7HL1ZDfjmqzgqrEf9+W/itXf
-RzjOSKF8rGUxD17VGvixTjZr6I8sZhhlR8Kgb7d7sSlmgUItRuoEyDRVrfliQly4
-6PDV/cYix4L++uACG8d0z5gwB21vsnSLAVPfexiXtY4CbsehTPfrhf8yw89a/Hei
-gRNjBoKyrVSYdKXECxYkixduONMDsasRwRbdRRfnPsaTtASI1t/Bi2EwAWoxDbkI
-4Ad/PfLO6oco3RNFJCSeLP+VW6MXEwmk3ujrpTd6ECMSlcmIoBvvuZ81orzSdmT4
-1vGZB19VXHpWC9m5r07EE6oG+HkKxmp1b86+CAGJ1hbjBNa3QqNUxrsvzQIDAQAB
-o0UwQzAiBgNVHREEGzAZghdmaWR1c3Rlc3Quc2tvbHZlcmtldC5zZTAdBgNVHQ4E
-FgQUDv8uj3imjyoLh8qJjED1Rci8+x8wDQYJKoZIhvcNAQELBQADggGBABki0Uss
-Xzz9/4FTlJY0gTwisOmvo5R/xn9HajR9PRyg5YJnsJxE0CDdRQTV6k0pE0cYV+A9
-Ev/m2y7THxO86dw67zQiP1bP9O7p1QP3zA2TlX1C5sWgeTljI/bZkW6rJ/xIeOk9
-JzhCzzD2zPBV0i/LRocghAJClTJdEQxuLIrmTbJbcHc0my4DM4eHINO9YQ2LfpGP
-4Kz5lZz0kARfuKbBz/QC3L+AkLKjh7UJ6FNfvRupC07rUEVpJwwgiV/v3Ef0+DpL
-oR5P4Hdks1CnyuacEpRKRbOY5HYGHyBumIFSbpysRu3mpfSpcWDQQyqnAQoS7CEt
-eQKU58ULt3DMTJFyH5pHBVTLpPAsxBjqfinGzPyNE3TlzFAGAGn/sQ8ylTRGDz4E
-hReiZhKJ/+guhujQSzhV80kwM0/k6r+Tc6Aqqs4Sogdzzi6+cOoy3z1zsi6Pqrez
-zbRoBwFaipg0RXn0PImBJD3yuXR8lGlFAgDgQ4Uq2GLrSOPG8+uZSgpvsg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fidustest.skolverket.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fidustest.skolverket.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fidustest.skolverket.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fidustest.skolverket.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fidustest.skolverket.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fidustest.skolverket.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
deleted file mode 100644
index b15d5636..00000000
--- a/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/metadata.php/sp1">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-12-09T16:04:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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="en">Skolverket Assessment Master</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
-        <mdui:Logo xml:lang="en" width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>SoNET Systems</md:Company>
-    <md:GivenName>Software</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
deleted file mode 100644
index 50b79ebe..00000000
--- a/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sso.skolverket.sonet.com.au/module.php/saml/sp/metadata.php/sp1">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-11-20T08:35:28Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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="en">Skolverket Assessment Master</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
-        <mdui:Logo xml:lang="en" width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>SoNET Systems</md:Company>
-    <md:GivenName>Software</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1744e742..0b1794e2 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -350,7 +350,6 @@
   <xi:include href="swamid-2.0/wikiu.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/urn-auth0-safarijv-uppsala-university.xml"/>
   <xi:include href="swamid-2.0/lu.beta.instructure.com-saml2.xml"/>
@@ -384,7 +383,6 @@
   <xi:include href="swamid-2.0/mystery.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/indico.nordu.net-mellon.xml"/>
   <xi:include href="swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/ams.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta-nyasidorna.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/appstest.convertus.se-shibboleth.xml"/>
@@ -400,7 +398,6 @@
   <xi:include href="swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml"/>
   <xi:include href="swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml"/>
-  <xi:include href="swamid-2.0/fidustest.skolverket.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/staging.ilabsolutions.com.xml"/>
   <xi:include href="swamid-2.0/my.ilabsolutions.com.xml"/>
   <xi:include href="swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml"/>
@@ -449,8 +446,6 @@
   <xi:include href="swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/disp.su.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml"/>
-  <xi:include href="swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/tds.test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunid.miun.se-saml-miun-metadata.xml"/>
@@ -463,8 +458,6 @@
   <xi:include href="swamid-2.0/sp.tshhosting.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wiki.pdc.kth.se.xml"/>
   <xi:include href="swamid-2.0/gdb.vr.se.xml"/>
-  <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/drive-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/primula.oru.se-shibboleth.xml"/>