Resolves SWAMID-3696

6 files changed, 0 insertions, 317 deletions

diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml
deleted file mode 100644
index 708acffd..00000000
--- a/swamid-2.0/scalear-saml.herokuapp.com.xml
+++ /dev/null
@@ -1,43 +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://scalear-saml.herokuapp.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="100">https://scalear-saml.herokuapp.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate> 
-     MIIDaDCCAlACCQC2IjZvk/9exTANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU1RPQ0tIT0xNMRIwEAYDVQQHEwlTVE9DS0hPTE0xGjAYBgNVBAoTEVNDQUxBQkxFIExFQVJOSU5HMSMwIQYDVQQDExpzY2FsZWFyLXNhbWwuaGVyb2t1YXBwLmNvbTAeFw0xNTExMjQxMzU5NDhaFw0xNjExMjMxMzU5NDhaMHYxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTVE9DS0hPTE0xEjAQBgNVBAcTCVNUT0NLSE9MTTEaMBgGA1UEChMRU0NBTEFCTEUgTEVBUk5JTkcxIzAhBgNVBAMTGnNjYWxlYXItc2FtbC5oZXJva3VhcHAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9v8WIZwEs/bOIBj/26QY6bKmwMua9NRNGta7wskrx5ClPU8RclyhdLEMIXMDf1B3Rmq92naz+XUFSXZczsVjBSxjUCwjKSkDnC/3VfVvGfThXzLI1MPChneilTxrMu4LyhtOf3Jty4vICX5ef0TV2gI3W1ttuVkzykU1GWBVRITTeMNQm22auF5CCq8XkK+6IgdVqhjo5xvqz05UgAhLbuSEeqqEjpzyRAjrfpMKkzjVygu/Ee2fcEjcZt0tVnj1fpM9pDyMl05yWhGbIdFFE9R0edl5Zn82sUGdFmMqgl+DIBZTmyqidawzMlw921wMDoxzH+o4cGGyHNC0ob+uOwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB5fNFyQTG08NQot3k/vPgeAJRGVS5g+1AaaOASA1v7DyLjkKpHS2EU5XMzOZ65tchzfgbXjx9JhrIMwqOI5pxt1k4d6NnWL+GOgvhA/yRWT4YFahy+HSQERRRZuzdDHsrjSYSBg8QvZ7AUFDc4b9SHJeygZAST/12cyAJiwCfWPIwCadIQ/EabtEtEgHkoD6Wgo2wcsw2ck+rJ3NcBjlUYAtHw4b+kmDgdNjGlm1/zT2y9oO08VOvlWcpCn/4O1wUEq3julnnuz9dpDtyKtSC+znGJxKS3O2jvg4tkm+3ZsLw0m8tJU9nhCq+E5Y3BoiXhHz/v5eGQofoZ7U85CnkT
-    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-saml.herokuapp.com/saml/consume"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
deleted file mode 100644
index c51dc79c..00000000
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ /dev/null
@@ -1,90 +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://scalear-staging2.herokuapp.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://scalear-staging2.herokuapp.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="100" width="100">https://scalear-staging2.herokuapp.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDkjCCAnoCCQC5Ve5a+sh3iDANBgkqhkiG9w0BAQsFADCBijELMAkGA1UEBhMC
-U0UxETAPBgNVBAgMCFNUT0NIT0xNMREwDwYDVQQHDAhTVE9DSE9MTTEaMBgGA1UE
-CgwRU0NBTEFCTEUgTEVBUk5JTkcxEDAOBgNVBAsMB3NjYWxlYXIxJzAlBgNVBAMM
-HnNjYWxlYXItc3RhZ2luZzIuaGVyb2t1YXBwLmNvbTAeFw0xODA2MjAxMDAxMDRa
-Fw0xOTA2MjAxMDAxMDRaMIGKMQswCQYDVQQGEwJTRTERMA8GA1UECAwIU1RPQ0hP
-TE0xETAPBgNVBAcMCFNUT0NIT0xNMRowGAYDVQQKDBFTQ0FMQUJMRSBMRUFSTklO
-RzEQMA4GA1UECwwHc2NhbGVhcjEnMCUGA1UEAwwec2NhbGVhci1zdGFnaW5nMi5o
-ZXJva3VhcHAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm3kp
-UxqZHhUz6iuCgcheF1jhgKOiMT40ulROVCFVj4UecHER/k1tmhfrXuqjKzVdj5fj
-BaAYQqrNoavJaHZ3u8qOSHJGRjJNMyecwRV5HHYH13V21ZfCf5UuhvotsYkC23/I
-meP03hh1iwTjBD3ooFNwQ7MONdoyWGRHUMPa/aIaqaUT6t/AB84mNZ7WwPxW8hjJ
-Mp+gDdBsXczvlNHvtGsQOv/+uwBYt3RYa/vs3GJKsZV6zmk8RmUf+zkNSHedqeGt
-K3ItlQ+lVkODNZ+ee1medXZjXwTCYW1t+I/e6hA5AEKs8JGmVypJ9fGYYNNW95AY
-/XRmkkARk9UMz2WGuQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB4koH+yV00y2JM
-n1wS2sZGD0llBG/g1zGsKM/gIEBWiTvG3qteI6H0f5F1hjWNO8TZlXQdUWTeJ8SV
-FQLB+/izRhHRJXdXyGghJNr+Y9PPBuqe5qgROEWc97i4A0LpbYVcWahMH8MVMgb2
-yC5bkoUyHu7RT9vhzVlOVUaOAq6i675xavGkjmDw7XGuIuJ4IRvni3LPL7pQ11Mm
-n5B3Ki7ZedRgz3K2SI3pmk+9/QUphUyhHv6fHxCnYS9DlUb35oir5Mf13Sek1Orr
-mobl6dq/UG4r+sHNUozUEoaUiAaRhQ4sRTE3zbMONbEi9n5e/+559yKyOjkutGs6
-B2dCYBmx
-     </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-staging2.herokuapp.com/saml/consume"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.10"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://scalear-staging2.herokuapp.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <Company>ScalableLearning</Company>
-    <GivenName>Security Response Team</GivenName>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml
deleted file mode 100644
index bfb3fa27..00000000
--- a/swamid-2.0/test.scalable-learning.com.xml
+++ /dev/null
@@ -1,89 +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://test.scalable-learning.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education. </mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://test.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://test.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="100" width="100">https://test.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDjjCCAnYCCQDfKJofoJ7XrzANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMC
-U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
-VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UE
-AwwadGVzdC5zY2FsYWJsZS1sZWFybmluZy5jb20wHhcNMTgwNjIwMDk1NTU0WhcN
-MjgwNjE3MDk1NTU0WjCBiDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVNUT0NLSE9M
-TTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYDVQQKDBFTQ0FMQUJMRSBMRUFSTklO
-RzEQMA4GA1UECwwHc2NhbGVhcjEjMCEGA1UEAwwadGVzdC5zY2FsYWJsZS1sZWFy
-bmluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPYtv2obOV
-NRyVFwnXcl0pdqz8LHo/vkJGPHc8UHla8w+ceQQ7NZlmSeVOvXskStYwqh4HzAyk
-FmTb7hkCTP9yRnLrLTZUd6z2q0I0Skdo8A8r02mFfDPFin049/pqau9dlwbvLQyL
-IDcp2iqGeudpkikl7Gn7/zBkERCtwmiROAIs9B9m5VoAddLp/oVGnmErSPj0iVBu
-FB9kTiPoix5UFbTVGYhRFZiy6vFYfanBf9TucRpP8MicE3pLsYQ3IcIT9gcAtpyb
-Y/GhHejXuxzEJ9QOkO1vRsL93ddxlAtWzewtBE8kKZYMbIkq5TyceQ1aTTVgKHqZ
-/pu/6E8ChiIJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADsgavTeaBYlECOLO/k+
-QtRy+R92n4pICy6QGWV0aOhPX6yL2FGdQmwieM5SgO85EFbpuAhAhwOUpMwO5Uvj
-/aYx8wlRj2ucYZh+H7T3bcx/9wSasFGKJkI12gxcbULCC+nHZNGvzwPkXLTanFwI
-L2kfOgLGzY9b9GOAncizHV4r83H0GHo8pbgKLYBY9ssD9IyetT+FhoH6DFQwDL/1
-j1SV5ez/228XSJoGmLVTT5E/x48Q2ZNPTqvuUb1w7CgDE39KfHXi2t5x8AcwzOYZ
-YN8K5nluRz9hxbHa0Gq8gmredDMer3VIw7UdQxUIeYyTblls9UEfwt4gs2yM3Rac
-b4Y=
-     </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://test.scalable-learning.com/saml/consume"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.10"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://test.scalable-learning.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Security Response Team</GivenName>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
deleted file mode 100644
index ff8eb4ed..00000000
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ /dev/null
@@ -1,88 +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://www.scalable-learning.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education. </mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="128" width="199">https://www.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDjDCCAnQCCQCh7bSsfobdQTANBgkqhkiG9w0BAQsFADCBhzELMAkGA1UEBhMC
-U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
-VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEiMCAGA1UE
-AwwZd3d3LnNjYWxhYmxlLWxlYXJuaW5nLmNvbTAeFw0xODA2MjAwOTM4NTRaFw0y
-ODA2MTcwOTM4NTRaMIGHMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU1RPQ0tIT0xN
-MRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
-MRAwDgYDVQQLDAdzY2FsZWFyMSIwIAYDVQQDDBl3d3cuc2NhbGFibGUtbGVhcm5p
-bmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut3wWgrigP2C
-L8zUlER/YfTtQCvExXxCBRLtP9pxHb4q3a+PkJvy+xUD4TZhtLu5rdMqXvSfrCCC
-K6FO+MoLmVu7BzANl2RW37FUtkc2oyDD79hVwyZkcb3VSbYe3v4E5wwyEr40EZuY
-VK8VvGXZWCj1jw3wWfqU8Y683luDvRq7B7dlRDkzV5NfuOhk0Ghq3WoqPX//1+TE
-hWrFXJw/t/KVIatePcOFUj2q8+fvAfVgJ/RS7NKCqbmcm7dYR38QptWXpK22FDEh
-9QNFFXLahLK/g52rMdonlL646TgXfHcYdK3h9uHkh0d2cTaNFUisho/RQ706GwOV
-rrmfMjKXrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQC2ZNlfR4tmpPP+IKSy+vyw
-KHJPktZ2K7MeOyNTTqALvehn6ocwAXYqZC3WzF8XRfylBDw0B8p+0X5n0zHur4SW
-k2wQZYqucXlSI4ieM09zjbMZ6L9KCmWKRgRSXrFKZBBIu2mKJOmNczjnMJA6Sv+H
-MPc3VCi4C5rN7EetQsGuorktolOdQFZRbL0loG2Z8/CAbW05/bZOLJ9BBoaw1iZn
-9o6ziZGDvSVeC5Fb//N8RvyNUtBJ503MoM2uHJnLUZSpc0tHqr30AXAuC7TYDqWU
-0tJT075eMQgPc8Mbxt8zlCui3nWZdWQ+3ynJsGuNl8yy1GX1xxN6bXdyOPHCpEY9
-     </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.10"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Security Response Team</GivenName>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 9f07f885..a80e6119 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -15,9 +15,6 @@
   <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
   <xi:include href="swamid-2.0/prisma.research.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/scalear-staging2.herokuapp.com.xml"/>
-  <xi:include href="swamid-2.0/test.scalable-learning.com.xml"/>
-  <xi:include href="swamid-2.0/www.scalable-learning.com.xml"/>
   <xi:include href="swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml"/>
   <xi:include href="swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/graylog.nordu.net-shibboleth.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ee89c671..193e604f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -36,7 +36,6 @@
   <xi:include href="swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-employee-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>
-  <xi:include href="swamid-2.0/scalear-saml.herokuapp.com.xml"/>
   <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-nya.bth.se-shibboleth.xml"/>
@@ -278,9 +277,6 @@
   <xi:include href="swamid-2.0/luvit.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.test.ladok.se-gui-sp.xml"/>
-  <xi:include href="swamid-2.0/scalear-staging2.herokuapp.com.xml"/>
-  <xi:include href="swamid-2.0/test.scalable-learning.com.xml"/>
-  <xi:include href="swamid-2.0/www.scalable-learning.com.xml"/>
   <xi:include href="swamid-2.0/sam.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.vr-rut.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/data.houseoffinance.se-shibboleth.xml"/>