SWAMID-888 SWAMID-889 SWAMID-890 SWAMID-891 SWAMID-892 SWAMID-893

7 files changed, 0 insertions, 452 deletions

diff --git a/swamid-2.0/irttools.nordu.net-shibboleth.xml b/swamid-2.0/irttools.nordu.net-shibboleth.xml
deleted file mode 100644
index b4496f48..00000000
--- a/swamid-2.0/irttools.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<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://irttools.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-08-23T15:44:37Z">
-      <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 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/nren-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 urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://irttools.nordu.net/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://irttools.nordu.net/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">NORDUnet IRTtools</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NORDUnet IRTtools</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Incidenthanteringsverktyg hos NORDUnet</mdui:Description>
-        <mdui:Description xml:lang="en">Incident Response tools run by NORDUnet</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>irttools.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=irttools.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAK8KXQfNyYTLMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmlydHRvb2xzLm5vcmR1Lm5ldDAeFw0xNzA4MjMxMTE5MTZaFw0yNzA4MjEx
-MTE5MTZaMB0xGzAZBgNVBAMTEmlydHRvb2xzLm5vcmR1Lm5ldDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL6sItohLO+ww9J0oWl0qThAIZyIMYRVNCX7
-UnWfyaQ63MRhczqXY7zNyjWOXrWSgaP6yX/hG35muOMHIUJun2bTHx1Fa2m34kLW
-fsXWAd67VmoJoU4bwoRf0Zz3FYlZHdARGx6SEbm6WKjCN7bbUuiWHYmHO/rOYtYN
-HwHENbih24ulPnhm+liHVtbFk6c0Tc5pRV4qc4veKrjzwY+v0PxLMwjs2n8VAIy8
-op9jPhlgtUMj8KWQxAJxea/6Y4NiMcg8CPlyD8GPvYKZE/S837W7ox9Jw8aYvDLa
-QKBo8QSgrZEB+zqA5yWxjSZKqoi++edXfs39gOxPyJoEy1PY0y8CAwEAAaNAMD4w
-HQYDVR0RBBYwFIISaXJ0dG9vbHMubm9yZHUubmV0MB0GA1UdDgQWBBS3Vxi2cgxF
-p3iCa4rOsY4BV0UQKTANBgkqhkiG9w0BAQUFAAOCAQEAm2AwAAPWP5IhK7DL9XcF
-opC4BG4BuwsP5HqHr2yDbk5+WeSXy9AB0seF6EVcEbPOoq7i0+RLUJ5yjM2wjqjy
-HmyhqPPhURwEaKq0AqQZZKsi5kvrNtfJtuV+p3gfIEgIFjnF+lDoPQY1eItG/Xb7
-TtypFJAka5/Yfj0m9HxeAJxuaUwLT2Fg0ucUpKNi5Te5YDAHUkNPVPfFHl+MsGhd
-A4UOOam6tvadl34oOEjF9e+zJbuAtm008b40iIIDqMsRI3Rb/FsmVR+BBHblknLP
-xwedfNcuKrbcpZA+YhGjl53ZUhNwH12CSudSADt1vuO97L2c3W0T4u0+KfXl+svz
-vg==
-</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://irttools.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://misp.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://irttools.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://irttools.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://irttools.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://irttools.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://misp.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://misp.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://misp.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://misp.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://irttools.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://irttools.nordu.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://irttools.nordu.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://irttools.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://irttools.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://grr.irt.nordu.net:8443/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://misp.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://misp.nordu.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://misp.nordu.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://misp.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://misp.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Pettai</md:SurName>
-    <md:EmailAddress>mailto:pettai@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/lobo2.lab.sunet.se-shibboleth.xml b/swamid-2.0/lobo2.lab.sunet.se-shibboleth.xml
deleted file mode 100644
index 06399e10..00000000
--- a/swamid-2.0/lobo2.lab.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,50 +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://lobo2.lab.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-06-30T14:51:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>lobo2.lab.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lobo2.lab.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAML/7NVXPHgMMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmxvYm8yLmxhYi5zdW5ldC5zZTAeFw0xNDA2MzAxMjQ2MjlaFw0yNDA2Mjcx
-MjQ2MjlaMB0xGzAZBgNVBAMTEmxvYm8yLmxhYi5zdW5ldC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANv+IOxBi0J3ZFp4X+8iAinKpojT4LII8Ost
-wllFgGcjrbarjDe9fZyOP0QJkw8BzQIRRveSrB8hcX/2ekKG6uTOc1klKjE8RfIo
-PUeIDm1qodd5VJKkoejbQZ/PF1Y3gBPdLmXkh1E1k+XlxuvBiC+GLRgwCljCP+Jp
-XJ5p4kP46xNzQeXBAExHgz0zNtOQVBnYJlmT18hoHAvNy1GGXfazXOX5bmDgrzKD
-fZXSsv0dMwJeH/mtkp6zcMMIG8awKSQVB4r7Ps/ok8iDfKU43JXNAbwMywWd7ooj
-f0TVA9VXVxb2sJIEwX96z1l4YqoVTNxdeagPXSNZG3hKjluCyp8CAwEAAaNAMD4w
-HQYDVR0RBBYwFIISbG9ibzIubGFiLnN1bmV0LnNlMB0GA1UdDgQWBBRZkMZIMbgy
-uc/8wmPJMdQ7hqRMRDANBgkqhkiG9w0BAQUFAAOCAQEAR4SDw2aQcOx2/eKYyeYp
-OP/Q/pTfDCwm/iu76kI6wufj7PdL2/4ovTRZaKv0jnzd5RP364wRCyzS+OQZHHaS
-LbeYrsJmBfKKGdXL9ESh2svL8Z6NVBmfDF/Kmxm6Xgd/BRrgmz/qSH0v3iaMyCpH
-5yro+XDI5AfteZfQg0AZDox+mMoR7wzFcymQpVA1Z5RWoRuPVC8oO9ILYcCrq+6M
-Nr4loPU74SFod1O6Y7SZ5A6Cz1JXaeAy0AXpvFXx8mK31mIVx3yjnFa9im4Sqraf
-MLNKAa3vUl765Wt8I1Q9p7FvbV0qki2rEk8Q/D6qnquI06uajRRybcH+qEoUFqRX
-pA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lobo2.lab.sunet.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml b/swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml
deleted file mode 100644
index 86a4fdfc..00000000
--- a/swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,86 +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://mailfilter-test.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-04-07T15:17:08Z">
-      <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/nren-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 urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/DS/kalmar3" index="3"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>canit.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=canit.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO/nNPqDBCrnMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Nhbml0Lm5vcmR1Lm5ldDAeFw0xMDA1MjAyMTUxMzRaFw0yMDA1MTcyMTUx
-MzRaMBoxGDAWBgNVBAMTD2Nhbml0Lm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALfQeLKTUhs0gBj90i/FarDm1qm6HYUelLlxK5JJamU+
-BQGaODimGYrh2IzqGUMRxafshp1Z82v2W9ApQKHXO1m7Jg37F/jXmmOLPoF/P4vJ
-gh+c+H8WnPaNOJpWEJlQ/HQaMe6MZ/dZCUNbBnd6MN9vj+MvWH/4mKxIB+HAuOyi
-BAZr2hZyeafWU3+1bHVxUJZQuidYUVY09Jahvp1+kDargSuu0CLClyxqiJtiQN3P
-mAwjveC+Eo83s3/WvEYYkwMYmXYWQf5Rsy7ezKyg6QNfdIfQL1T0hOVmRXwYnzVY
-3zypH/tIaOeAa++fehFQiXB8v7wtTJSpFS9oFsaEFeMCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPY2FuaXQubm9yZHUubmV0MB0GA1UdDgQWBBS0ezKIFjEF0O8UJQKM/2D1
-tp9scDANBgkqhkiG9w0BAQUFAAOCAQEAYWr+FCcA+9Q10RVl7b76EbZaKVjmNsey
-endNf62gKsdu7zbwyAxHVOQ+XA5qZS6kLQThVnF5IJASWO9OJWF3x3Q62TLEXtw0
-cde5YFPhrfdZqRof1dptwD7Bt7kTl6vUV1V5wt1nXMax+rZv6tj08mRaUqBfWZ8w
-obZ3raXz4kaDjT1EGFjwbIc4rS7mZjYwuTGT79zB19BIR5qnL4YvXu44koq02p4S
-9TW8EETE3axOzPF3Vvtmag2vgX9pFJ7G/gFt3Adt6ZKzo1a6GZ9kZKIaE5Dr2Tnn
-VXfcZO7EtnsxYb035Zcei+quLWwJFAIKXwMSWZQEVo4WXa83B8oKnw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>canit.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=canit.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO/nNPqDBCrnMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Nhbml0Lm5vcmR1Lm5ldDAeFw0xMDA1MjAyMTUxMzRaFw0yMDA1MTcyMTUx
-MzRaMBoxGDAWBgNVBAMTD2Nhbml0Lm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALfQeLKTUhs0gBj90i/FarDm1qm6HYUelLlxK5JJamU+
-BQGaODimGYrh2IzqGUMRxafshp1Z82v2W9ApQKHXO1m7Jg37F/jXmmOLPoF/P4vJ
-gh+c+H8WnPaNOJpWEJlQ/HQaMe6MZ/dZCUNbBnd6MN9vj+MvWH/4mKxIB+HAuOyi
-BAZr2hZyeafWU3+1bHVxUJZQuidYUVY09Jahvp1+kDargSuu0CLClyxqiJtiQN3P
-mAwjveC+Eo83s3/WvEYYkwMYmXYWQf5Rsy7ezKyg6QNfdIfQL1T0hOVmRXwYnzVY
-3zypH/tIaOeAa++fehFQiXB8v7wtTJSpFS9oFsaEFeMCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPY2FuaXQubm9yZHUubmV0MB0GA1UdDgQWBBS0ezKIFjEF0O8UJQKM/2D1
-tp9scDANBgkqhkiG9w0BAQUFAAOCAQEAYWr+FCcA+9Q10RVl7b76EbZaKVjmNsey
-endNf62gKsdu7zbwyAxHVOQ+XA5qZS6kLQThVnF5IJASWO9OJWF3x3Q62TLEXtw0
-cde5YFPhrfdZqRof1dptwD7Bt7kTl6vUV1V5wt1nXMax+rZv6tj08mRaUqBfWZ8w
-obZ3raXz4kaDjT1EGFjwbIc4rS7mZjYwuTGT79zB19BIR5qnL4YvXu44koq02p4S
-9TW8EETE3axOzPF3Vvtmag2vgX9pFJ7G/gFt3Adt6ZKzo1a6GZ9kZKIaE5Dr2Tnn
-VXfcZO7EtnsxYb035Zcei+quLWwJFAIKXwMSWZQEVo4WXa83B8oKnw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mailfilter.nordu.net-shibboleth.xml b/swamid-2.0/mailfilter.nordu.net-shibboleth.xml
deleted file mode 100644
index 0b841c75..00000000
--- a/swamid-2.0/mailfilter.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://mailfilter.nordu.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-14T10:29:19Z">
-      <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/nren-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 urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>mailfilter.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mailfilter.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAJ5oV5rQ7B3hMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE21haWxmaWx0ZXIuc3VuZXQuc2UwHhcNMTAwODI2MTk0NDIyWhcNMjAwODIz
-MTk0NDIyWjAeMRwwGgYDVQQDExNtYWlsZmlsdGVyLnN1bmV0LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwGz7eWqtVCW3Be28I+IPpODVQDPQIwi
-chEFFSJdlkF7c9XN806yVAaGvsOrnNaFUTM5h/Gc4Hak1A0puoLI1aMkyeA0sMWb
-Mi6owbVDrjXGoD4gAoC9AIhqfj0NtE8zGlbGsL0dezM68NJwIt2C30U1rzOfUS53
-rngSTvleQK0lnd8I2Sys+msN6kP+4N64A3IBg6A2AVZtaadB6fJIoxQrQOhU3N1U
-AfaK8TcLaclVC5PfiwuJuiSLM0RgMy68B0Fht0V6lUpdiBoF5nU4sKAVYjZz+ZHo
-pi6sntIe+FchSvmDXf7zqqLS/NQiM+bD65T/nvazAbtBIbKmWb817wIDAQABo0Ew
-PzAeBgNVHREEFzAVghNtYWlsZmlsdGVyLnN1bmV0LnNlMB0GA1UdDgQWBBQ+3/bs
-Sg4SKO4FCGqYge9BF2au7TANBgkqhkiG9w0BAQUFAAOCAQEAVxV3i2vePzZeSjyy
-/i7KiU62byrG6YVBpUnmuofRuNtrC0pvnEMlGYI93pqOuQOe0sw5CEweIIyeTfQ2
-7AlQPA3kiIyvG1mubSJH421oJWXt1GJD/RRH56uJtGUzOykEC350lwcQ3chnQauO
-TJuwybaXhBX3CiHaq2aUt4rLRCiY4q3i2n0x/K5h3YajaI1I/6kSmA/2i6N7kUM3
-ywk5dDSfqTd62MTtqC8hJXQj0pQlQ/9GBeoyE83uTSrPR+Fo3bcGPu6WPs3FeQY5
-EeerFHSYV6H0U7y47ZJcBMX2n4xZXMZbTYTlX1AHOYiU3y7I/ZCvSuZScFBK5Lk/
-KHCx/w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>mailfilter.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mailfilter.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAJ5oV5rQ7B3hMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE21haWxmaWx0ZXIuc3VuZXQuc2UwHhcNMTAwODI2MTk0NDIyWhcNMjAwODIz
-MTk0NDIyWjAeMRwwGgYDVQQDExNtYWlsZmlsdGVyLnN1bmV0LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwGz7eWqtVCW3Be28I+IPpODVQDPQIwi
-chEFFSJdlkF7c9XN806yVAaGvsOrnNaFUTM5h/Gc4Hak1A0puoLI1aMkyeA0sMWb
-Mi6owbVDrjXGoD4gAoC9AIhqfj0NtE8zGlbGsL0dezM68NJwIt2C30U1rzOfUS53
-rngSTvleQK0lnd8I2Sys+msN6kP+4N64A3IBg6A2AVZtaadB6fJIoxQrQOhU3N1U
-AfaK8TcLaclVC5PfiwuJuiSLM0RgMy68B0Fht0V6lUpdiBoF5nU4sKAVYjZz+ZHo
-pi6sntIe+FchSvmDXf7zqqLS/NQiM+bD65T/nvazAbtBIbKmWb817wIDAQABo0Ew
-PzAeBgNVHREEFzAVghNtYWlsZmlsdGVyLnN1bmV0LnNlMB0GA1UdDgQWBBQ+3/bs
-Sg4SKO4FCGqYge9BF2au7TANBgkqhkiG9w0BAQUFAAOCAQEAVxV3i2vePzZeSjyy
-/i7KiU62byrG6YVBpUnmuofRuNtrC0pvnEMlGYI93pqOuQOe0sw5CEweIIyeTfQ2
-7AlQPA3kiIyvG1mubSJH421oJWXt1GJD/RRH56uJtGUzOykEC350lwcQ3chnQauO
-TJuwybaXhBX3CiHaq2aUt4rLRCiY4q3i2n0x/K5h3YajaI1I/6kSmA/2i6N7kUM3
-ywk5dDSfqTd62MTtqC8hJXQj0pQlQ/9GBeoyE83uTSrPR+Fo3bcGPu6WPs3FeQY5
-EeerFHSYV6H0U7y47ZJcBMX2n4xZXMZbTYTlX1AHOYiU3y7I/ZCvSuZScFBK5Lk/
-KHCx/w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mailfilter.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mailfilter.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mailfilter.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SUNET Mailfilter Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SUNET Mailfilter Service</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/saml.salesforce.com-sunet.xml b/swamid-2.0/saml.salesforce.com-sunet.xml
deleted file mode 100644
index db81aecd..00000000
--- a/swamid-2.0/saml.salesforce.com-sunet.xml
+++ /dev/null
@@ -1,50 +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://saml.salesforce.com/sunet">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-10-12T13:51:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHzCCBAegAwIBAgIQD2tONdSBjQGbZ8+sA+HVEzANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMGsxCzAJBgNVBAYT
-AlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwG
-A1UEChMFU1VORVQxDjAMBgNVBAsTBVNVTkVUMRQwEgYDVQQDEwtzZi5zdW5ldC5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/0TD8NsbUXpj0yJ6Be
-pXIQqLxrv5xgEiuhAGfn+MvwEuUcb4vmQF0dA+m+SH0UpZU6FmZojV05MbkgKYz8
-XL6cFVa+g7j4J5/o3Na+gBY/4b4aT6NPUnnb1rvFeNx5xhdRTAA5NSbjUMGq4M4B
-G7+BEliXjMnM3Mr8zWW9sa8PA+OdUjPDdMwAndPOq8YI/tX165an9Z5tbeZIgtju
-CDadHUNCftV0l+y7OPKZBNa9xBkxhYJn3uhUmtPLCRMcoJl133fF8l3hcZCmN8VM
-GfBXjgJCbX+kj9L+EMYgeq+uCg5URJUkyIuSo7eRsuErutnveBFSW6OaFFpB4Qum
-kUMCAwEAAaOCAcQwggHAMB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBi
-MB0GA1UdDgQWBBTG0Y7JCUh80anIjXwec3e+abqhwzAWBgNVHREEDzANggtzZi5z
-dW5ldC5zZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNv
-bS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5j
-b20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgG
-CCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAEC
-AjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2lj
-ZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29t
-L1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOC
-AQEAa1JI3WfoVsQrWrBTmg5FqjrCIIPXkcr/1Rmuni1zj2hMiEpSQz51ASdyuu84
-HTvww4bx32jdF4kyFIxaW1TZTbXRLroCInXUiaMXAFlJKXNCjgfkaLB9IWMabJ6U
-cIxSFOivZLBgLssFoFUyQF84p2ZT7SGtGwFgOFBmizMJO/TZKJo/lHsJXFIrEwLv
-/P83Y8WQTZ5fUNrlNXTV0LIuohyL4wgY/8KDe7U0207jOf3jE8R6zv25USJaI1E+
-x+TDkFy4ZwN1xXX01pTyPn/PGCoiie79oSDcxOH2+WVNZ2JqG7U03N84WEm2wYun
-nPA9vl27A5iiVuLoU2ewPK30PQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunet.my.salesforce.com?so=00D24000000IrNa" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">Salesforce.com</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/sunet.my.salesforce.com.xml b/swamid-2.0/sunet.my.salesforce.com.xml
deleted file mode 100644
index 515c6eed..00000000
--- a/swamid-2.0/sunet.my.salesforce.com.xml
+++ /dev/null
@@ -1,50 +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://sunet.my.salesforce.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-01-15T15:48:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHzCCBAegAwIBAgIQD2tONdSBjQGbZ8+sA+HVEzANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMGsxCzAJBgNVBAYT
-AlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwG
-A1UEChMFU1VORVQxDjAMBgNVBAsTBVNVTkVUMRQwEgYDVQQDEwtzZi5zdW5ldC5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/0TD8NsbUXpj0yJ6Be
-pXIQqLxrv5xgEiuhAGfn+MvwEuUcb4vmQF0dA+m+SH0UpZU6FmZojV05MbkgKYz8
-XL6cFVa+g7j4J5/o3Na+gBY/4b4aT6NPUnnb1rvFeNx5xhdRTAA5NSbjUMGq4M4B
-G7+BEliXjMnM3Mr8zWW9sa8PA+OdUjPDdMwAndPOq8YI/tX165an9Z5tbeZIgtju
-CDadHUNCftV0l+y7OPKZBNa9xBkxhYJn3uhUmtPLCRMcoJl133fF8l3hcZCmN8VM
-GfBXjgJCbX+kj9L+EMYgeq+uCg5URJUkyIuSo7eRsuErutnveBFSW6OaFFpB4Qum
-kUMCAwEAAaOCAcQwggHAMB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBi
-MB0GA1UdDgQWBBTG0Y7JCUh80anIjXwec3e+abqhwzAWBgNVHREEDzANggtzZi5z
-dW5ldC5zZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNv
-bS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5j
-b20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgG
-CCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAEC
-AjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2lj
-ZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29t
-L1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOC
-AQEAa1JI3WfoVsQrWrBTmg5FqjrCIIPXkcr/1Rmuni1zj2hMiEpSQz51ASdyuu84
-HTvww4bx32jdF4kyFIxaW1TZTbXRLroCInXUiaMXAFlJKXNCjgfkaLB9IWMabJ6U
-cIxSFOivZLBgLssFoFUyQF84p2ZT7SGtGwFgOFBmizMJO/TZKJo/lHsJXFIrEwLv
-/P83Y8WQTZ5fUNrlNXTV0LIuohyL4wgY/8KDe7U0207jOf3jE8R6zv25USJaI1E+
-x+TDkFy4ZwN1xXX01pTyPn/PGCoiie79oSDcxOH2+WVNZ2JqG7U03N84WEm2wYun
-nPA9vl27A5iiVuLoU2ewPK30PQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunet.my.salesforce.com?so=00D24000000IrNa" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">Salesforce.com</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 78479d30..00be1cc9 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -82,7 +82,6 @@
   <xi:include href="swamid-2.0/beta.lobber.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www07test.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/fordrop.irt.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/mailfilter-test.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/unitcf.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
@@ -99,7 +98,6 @@
   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/meta2.eduroam.se.xml"/>
@@ -157,7 +155,6 @@
   <xi:include href="swamid-2.0/se.timeedit.net-su-student-sp.xml"/>
   <xi:include href="swamid-2.0/produktwebb.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/activate.du.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/lobo2.lab.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tools.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
@@ -336,7 +333,6 @@
   <xi:include href="swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml"/>
   <xi:include href="swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-ki.xml"/>
-  <xi:include href="swamid-2.0/irttools.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/portaluu.onricoh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml"/>
@@ -375,8 +371,6 @@
   <xi:include href="swamid-2.0/nfg.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/studiumbb.uu.se-studium.xml"/>
   <xi:include href="swamid-2.0/valda.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sunet.my.salesforce.com.xml"/>
-  <xi:include href="swamid-2.0/saml.salesforce.com-sunet.xml"/>
   <xi:include href="swamid-2.0/irf.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hhs-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/his-se.zoom.us.xml"/>