Resolves SWAMID-19

8 files changed, 0 insertions, 661 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 23cff7f9..6b5ce717 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -2,8 +2,6 @@
 # Do not allow new SP:s with SimpleSign enabled
 # Shibboleth SP 2.5+ defaults to SimpleSign, failes on ADFS IdP:s
 # fredrik - 2014-04-08
-account-test.unit.liu.se-shibboleth-sp.xml
-account.liu.se-shibboleth-sp.xml
 account.mdh.se-shibboleth.xml
 accountcheckout.lnu.se.xml
 activate-test.du.se-shibboleth.xml
diff --git a/swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml b/swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml
deleted file mode 100644
index 1479f2fa..00000000
--- a/swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml
+++ /dev/null
@@ -1,74 +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://account-test.unit.liu.se/shibboleth-sp">
-  <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>
-  </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:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>hydracenter-test</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hydracenter-test</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIvqrDdZ31ugMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGh5ZHJhY2VudGVyLXRlc3QwHhcNMDkxMDI5MTMyOTU3WhcNMTkxMDI3MTMy
-OTU3WjAbMRkwFwYDVQQDExBoeWRyYWNlbnRlci10ZXN0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA74C0BefO5DyInVmyDdbhqSegG/CF1xFOfmfrP7+u
-eV5kYs9D1j+kK8o1ZCefmB7VK4Gr7GGTDExcD8XJloEes6ijx3jaUc9LE+y11ReC
-jNNcpwk9JJ3NadIzIu9o7/On39l0GTDH473xbrI55i3SYmoBQqqFvHGHyJnEEO5K
-hlRssy3SNFBt1jfWqpHDX9ocoAIlUKivIYZwZjg6aGRxvRCZ0gVU8AFLBr4XcwRf
-t5nizTs3/VqmHrD6ICru2phHRN2tc2NgCEkatPs7rshfn5rZTuML08zmMVVgjcR1
-5lzaGE+GkL3BSHj6grIaR43Qom2l/eD2yil9JC4jfI6pLQIDAQABoz4wPDAbBgNV
-HREEFDASghBoeWRyYWNlbnRlci10ZXN0MB0GA1UdDgQWBBS2/zfSiV0VTt5wxprv
-DOiejU8O1TANBgkqhkiG9w0BAQUFAAOCAQEAn86tJFlHPE/zwsRzcYp5Dk6SwpzG
-UYhYt6eAc+8Z6gioJsyM8MD0SfwF5iFdVo88Jm2K55npbgzBj34Uxi4vIItAYpSr
-jympe4FMjW6MTOqN6vJtws1U3bn976VvflPr1d4rMoqTxAYue3S/zQ8Y179MvBrr
-F0Bc+PJrsIP4MfYN3b98OAn8kxzGSy1AU6vx/gi+SOQNh3c3kQ0HABhdGBOwmJS3
-e4QPMkOZh0KWHSZZBRc8wDpEwsXHD8q8Ag63Qz0l7DRIQnGkJyQb18ylBbg3fLEW
-fiiVqOsqvroKvOIwKEjtUzxaFg2kDWlXia4AQctOto28G9ftYkXqGxPFgA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>hydracenter-test</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hydracenter-test</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIvqrDdZ31ugMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGh5ZHJhY2VudGVyLXRlc3QwHhcNMDkxMDI5MTMyOTU3WhcNMTkxMDI3MTMy
-OTU3WjAbMRkwFwYDVQQDExBoeWRyYWNlbnRlci10ZXN0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA74C0BefO5DyInVmyDdbhqSegG/CF1xFOfmfrP7+u
-eV5kYs9D1j+kK8o1ZCefmB7VK4Gr7GGTDExcD8XJloEes6ijx3jaUc9LE+y11ReC
-jNNcpwk9JJ3NadIzIu9o7/On39l0GTDH473xbrI55i3SYmoBQqqFvHGHyJnEEO5K
-hlRssy3SNFBt1jfWqpHDX9ocoAIlUKivIYZwZjg6aGRxvRCZ0gVU8AFLBr4XcwRf
-t5nizTs3/VqmHrD6ICru2phHRN2tc2NgCEkatPs7rshfn5rZTuML08zmMVVgjcR1
-5lzaGE+GkL3BSHj6grIaR43Qom2l/eD2yil9JC4jfI6pLQIDAQABoz4wPDAbBgNV
-HREEFDASghBoeWRyYWNlbnRlci10ZXN0MB0GA1UdDgQWBBS2/zfSiV0VTt5wxprv
-DOiejU8O1TANBgkqhkiG9w0BAQUFAAOCAQEAn86tJFlHPE/zwsRzcYp5Dk6SwpzG
-UYhYt6eAc+8Z6gioJsyM8MD0SfwF5iFdVo88Jm2K55npbgzBj34Uxi4vIItAYpSr
-jympe4FMjW6MTOqN6vJtws1U3bn976VvflPr1d4rMoqTxAYue3S/zQ8Y179MvBrr
-F0Bc+PJrsIP4MfYN3b98OAn8kxzGSy1AU6vx/gi+SOQNh3c3kQ0HABhdGBOwmJS3
-e4QPMkOZh0KWHSZZBRc8wDpEwsXHD8q8Ag63Qz0l7DRIQnGkJyQb18ylBbg3fLEW
-fiiVqOsqvroKvOIwKEjtUzxaFg2kDWlXia4AQctOto28G9ftYkXqGxPFgA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account-test.unit.liu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account-test.unit.liu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-test.unit.liu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-test.unit.liu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account-test.unit.liu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account-test.unit.liu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-test.unit.liu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-test.unit.liu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account-test.unit.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/account.liu.se-shibboleth-sp.xml b/swamid-2.0/account.liu.se-shibboleth-sp.xml
deleted file mode 100644
index 1d279332..00000000
--- a/swamid-2.0/account.liu.se-shibboleth-sp.xml
+++ /dev/null
@@ -1,103 +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://account.liu.se/shibboleth-sp">
-  <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:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>account.liu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=account.liu.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIJAJE6W/GYfYV8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmFjY291bnQubGl1LnNlMB4XDTExMTIxNTE1MDA1MVoXDTIxMTIxMjE1MDA1
-MVowGTEXMBUGA1UEAxMOYWNjb3VudC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC54kD9+4WlO7e8EgClxfjujUETGlRTB84iz6MRScEY4ugM
-48M441l8CM850y1iWWVRM/th49vK8mAURCeUsHJ1dfxD1Adh5MWrsFXPo2UXEzac
-UhKIXYD22Do8pBFEAI0u9+/YcxySIt4KhcXaPthlvTScOrAxNRqSOFBPzFMgPumQ
-yb6i+8kADTQU72Ad6d+xfJBN9Rc24Yy/l0XGM4GctIGs5W8lSJ67aaaDxbgf8btf
-NOGHprsf+JLxFqbLTitF9+SJcxCPc2OWRavfP58km5SxSi71hB/46Emsd2sa/q3k
-wgcX95I7xf4gtWmZjCp5vdXqCFThQOZBttlc8embAgMBAAGjYjBgMD8GA1UdEQQ4
-MDaCDmFjY291bnQubGl1LnNlhiRodHRwczovL2FjY291bnQubGl1LnNlL3NoaWJi
-b2xldGgtc3AwHQYDVR0OBBYEFPv4FgWJUwm6PhyMBm71+zlKKigPMA0GCSqGSIb3
-DQEBBQUAA4IBAQAe9SVnBilv4xxCohBBYa3ovoOj2G3ULiaavJ41IKe8OmzNEjx/
-dpBdtag4bK9ZmpTxF4TN/JbD4fI73M3kj4T29BlLsAggmOIjN0c89KfgbSommSt2
-ccx/lz9XSsxbxNwFy/1SIlgALjpTdJahy031x4W9Rydos1sBIq04bulSpjyfuWfZ
-D/Qn4x1CAkjhi5IQFugKiBM8UXiWf8jqowj69gblHE0Vboy6LjWwAukN6FhPENTI
-CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ
-4d/qcTqO06jfZ8yC2PJZgOOkUmNRsIUAk2if
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>account.liu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=account.liu.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIJAJE6W/GYfYV8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmFjY291bnQubGl1LnNlMB4XDTExMTIxNTE1MDA1MVoXDTIxMTIxMjE1MDA1
-MVowGTEXMBUGA1UEAxMOYWNjb3VudC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC54kD9+4WlO7e8EgClxfjujUETGlRTB84iz6MRScEY4ugM
-48M441l8CM850y1iWWVRM/th49vK8mAURCeUsHJ1dfxD1Adh5MWrsFXPo2UXEzac
-UhKIXYD22Do8pBFEAI0u9+/YcxySIt4KhcXaPthlvTScOrAxNRqSOFBPzFMgPumQ
-yb6i+8kADTQU72Ad6d+xfJBN9Rc24Yy/l0XGM4GctIGs5W8lSJ67aaaDxbgf8btf
-NOGHprsf+JLxFqbLTitF9+SJcxCPc2OWRavfP58km5SxSi71hB/46Emsd2sa/q3k
-wgcX95I7xf4gtWmZjCp5vdXqCFThQOZBttlc8embAgMBAAGjYjBgMD8GA1UdEQQ4
-MDaCDmFjY291bnQubGl1LnNlhiRodHRwczovL2FjY291bnQubGl1LnNlL3NoaWJi
-b2xldGgtc3AwHQYDVR0OBBYEFPv4FgWJUwm6PhyMBm71+zlKKigPMA0GCSqGSIb3
-DQEBBQUAA4IBAQAe9SVnBilv4xxCohBBYa3ovoOj2G3ULiaavJ41IKe8OmzNEjx/
-dpBdtag4bK9ZmpTxF4TN/JbD4fI73M3kj4T29BlLsAggmOIjN0c89KfgbSommSt2
-ccx/lz9XSsxbxNwFy/1SIlgALjpTdJahy031x4W9Rydos1sBIq04bulSpjyfuWfZ
-D/Qn4x1CAkjhi5IQFugKiBM8UXiWf8jqowj69gblHE0Vboy6LjWwAukN6FhPENTI
-CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ
-4d/qcTqO06jfZ8yC2PJZgOOkUmNRsIUAk2if
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.liu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.liu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.liu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.liu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account.liu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.liu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.liu.se/?l=sv</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.liu.se/?l=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>LiU-IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
deleted file mode 100644
index 7fe2a4ce..00000000
--- a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,244 +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://login.it.liu.se/idp/shibboleth">
-  <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" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linköpings Universitet - old</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University - old</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-        <mdui:Logo height="68" width="350">https://login.it.liu.se/images/logo/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="68" width="350">https://login.it.liu.se/images/logo/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="68" width="350">https://login.it.liu.se/images/logo/logo-350x68-en.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>liu.se</mdui:DomainHint>
-        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.36.54.0/24</mdui:IPHint>
-        <mdui:IPHint>192.36.93.0/24</mdui:IPHint>
-        <mdui:IPHint>192.36.94.0/24</mdui:IPHint>
-        <mdui:IPHint>192.12.235.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.86.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:4c::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.397836,15.576008</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:58.403479,15.622827</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:58.589874,16.176439</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.350824,18.143391</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUHcc+HFeluG9u/Vu5nkuV1Y6IFhAwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4uaXQubGl1LnNlMB4XDTE3MDMxNTE1MjY1MVoX
-DTM3MDMxNTE1MjY1MVowGjEYMBYGA1UEAwwPbG9naW4uaXQubGl1LnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvy/nXnEFMt1jK0yEL6LgvrGuVdc
-3oULKcfmcvw4PvgVl2/+RmQWsaDLPmhTixGIq1yJVhTNmmtCL37hxPSClvYUd91+
-H/csc9SJSi74chhfzt6zCBWeFM8F/mG7lSy/7eNPz8Ik6u0iNkuD5c1998zI6HGr
-wYN8aaH540jBSdbLlqBkuOsk2oU/Du/j3cVIM9349zI09yxcJ68Gr3vebI+bcVEk
-Kf3AVZr04/n8m7sN7VHr9IDvW5kJv/fMttzXwu2BTl7eQgUBTzdLBECYBkolYUVt
-pIV/JmS6DMlfjI8ax6r5WszSImzfFYRJj8xibXPunK3d5pfszxmwMSqPpQIDAQAB
-o2UwYzAdBgNVHQ4EFgQUl8PX8gvOt+qFhbwtZ6QT1MpMN54wQgYDVR0RBDswOYIP
-bG9naW4uaXQubGl1LnNlhiZodHRwczovL2xvZ2luLml0LmxpdS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQyaKq6SShk5VgJg+Mc0cOySVKful
-dErocA36zzVcPdZ7D+BYBMkQAQHfuuHs+MPvC2jMysqFXW1I1aW3fBZ+xDeUZrK/
-4D/AcNDfmmeQE2wCgjsniNW67NEAUuMmUa/S+rlL0cDn1Pia/2yBfubTbhHEvWxA
-FY69CDg0bywMnqA7PBfSON5H3WdevD3zs313Mag9Zy+eoAITv8Q5Gv2EHYLbYaIa
-tKMiJ3vl+XqigygtUir/UsLnHE7dXQwBmLVxN/mWhpU4ot79woW5Al5oKdvdfHy0
-CqAGwzHRYPQVtblIYJC5W9BhZ1l5PcIkobdhCQYT1iGibMTiEyjdEVa0pw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAK4ZRjYBPQC0lBL2HMorIwHx4Zm/MA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTAeFw0xNzAzMTUxNTI2NDla
-Fw0zNzAzMTUxNTI2NDlaMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYukue0LoJYjbLSzvhG2rEkl4WB
-0BexAgaLOegD+4sZ8uMu/iqVU/CY5oyNmtNWpgK4PKWgOWAVXn61s30H80wqUarZ
-xuvzsQWoHcZDoJlcEfMcol7SU3IMY1HuslWkprsDcxrEQBh32zKb2QVz+VIHldeb
-JHOuiSTF6U2S/FZbL85HBFEJ/D2bLf2dn+Txs/dChMTmGkoq14Fvx6U0iaTXGSsP
-pCVyHPXvmhy19YgOh0NxUa3dmejJawSLAg7mvCWJNw9oMrh1nLvTCMzKa8mT5jY9
-KGMHbC/OROa/iVMjUWDcSenUclN8sQzKMSUZq0nBvtyQ+QkfCRIa0dTt0W0CAwEA
-AaNlMGMwHQYDVR0OBBYEFKOByX3ixO5csXU1uL/3+DfCO6SmMEIGA1UdEQQ7MDmC
-D2xvZ2luLml0LmxpdS5zZYYmaHR0cHM6Ly9sb2dpbi5pdC5saXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAH28tjQc9K6+XGkrEIngOAJYFooJ
-BXWPcOjcBktzCpBQEkwsBQUm49CyXmh/iUD19lBDaLeiHZfTCqc9ngfUbEoa6eZc
-882sounMumAd26GUouRo0NPOycXqjy60/lLYI8YnEg5QNiZhg+3DelIaZbMBPGF/
-pOI7/v5bNfrwAYq2/z2+AIffaaEElfxL29Af7LiFlyaD1POq2x7usHWejWzC0q+P
-dIIc188IIlVfFQJxJ0wl9wIb0Jkz7vwmWyo/KRre7YJTBXo5ig4i7qRuL5ZTHrTp
-iKFAgcegluwZn0xVjNzrTm7fD4zRUJ8SuHo+B42F3JvwrPKpEueEZSXpkZo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAM5tJLVR6quocWTQDzeuBTjcbIjgMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTAeFw0xNzAzMTUxNTI2NTBa
-Fw0zNzAzMTUxNTI2NTBaMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYAhztRzpt3nvtV2ohqShSMu7zP
-AkV5EfgRf8jYT0AKbkts5WJh5OyaS2kZiRPlXM5uEh4OvoZrhQ/3ZgaeHibzx9/t
-8MO4zNpR/qth0xDtJcYDtqZtMSrXEeaYgAIX+UoqQlSMpQO8CWCkmqHWyWMcmld/
-LLC5K5AMUGx/ATE5dys/+QnuVAGjuAS1KGE8zarn0rUGBHMCmgsMflONqHYhW/L1
-++o9UzptvxrvJuJuF/r5f8rQU6dztlKGJeqkuf3HP9PEcAFseog9d1v/2MNic+R6
-66P3IgM+Yp3jzEeXgwAkA5FpGyHMLz4/O7dmz7rqbRTo4VB8WeF1/Mmosv8CAwEA
-AaNlMGMwHQYDVR0OBBYEFATiAWTWv1fBJuYIO0v7DJmM6C73MEIGA1UdEQQ7MDmC
-D2xvZ2luLml0LmxpdS5zZYYmaHR0cHM6Ly9sb2dpbi5pdC5saXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEMw6+CAAxRIxbGtebdkOTRQ2eQf
-hhrkRckGjuE4H3j1MrpkQzSaRqpowXaB9zqO1EZGA+AB8s2zbfMs0GXzD8rtmnKi
-YG7XvkoNPM9n5sTWyu64bEAZ+gTPgETDHCSwKIhHW+krZgkFFM1dZvQlcB0/FPG7
-yrnXkTsFVKk01ixFDyFizKc2fOryHuiKwRbmkdJvn0BIlpY/EXSz0VCrWmEyfYb5
-7NrUVEgiSfLs+HCyjIl5riIMiiucGo8jRZECpY+neVE6vP4pQWI1tCg4QfjwQAFf
-RZPA+Q2niYC920FIv6uscwfFJR4PEFBA83wLSZ39FDm79HM3TNQ9KFtgLY8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.it.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.it.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.it.liu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.it.liu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.it.liu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUHcc+HFeluG9u/Vu5nkuV1Y6IFhAwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4uaXQubGl1LnNlMB4XDTE3MDMxNTE1MjY1MVoX
-DTM3MDMxNTE1MjY1MVowGjEYMBYGA1UEAwwPbG9naW4uaXQubGl1LnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvy/nXnEFMt1jK0yEL6LgvrGuVdc
-3oULKcfmcvw4PvgVl2/+RmQWsaDLPmhTixGIq1yJVhTNmmtCL37hxPSClvYUd91+
-H/csc9SJSi74chhfzt6zCBWeFM8F/mG7lSy/7eNPz8Ik6u0iNkuD5c1998zI6HGr
-wYN8aaH540jBSdbLlqBkuOsk2oU/Du/j3cVIM9349zI09yxcJ68Gr3vebI+bcVEk
-Kf3AVZr04/n8m7sN7VHr9IDvW5kJv/fMttzXwu2BTl7eQgUBTzdLBECYBkolYUVt
-pIV/JmS6DMlfjI8ax6r5WszSImzfFYRJj8xibXPunK3d5pfszxmwMSqPpQIDAQAB
-o2UwYzAdBgNVHQ4EFgQUl8PX8gvOt+qFhbwtZ6QT1MpMN54wQgYDVR0RBDswOYIP
-bG9naW4uaXQubGl1LnNlhiZodHRwczovL2xvZ2luLml0LmxpdS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQyaKq6SShk5VgJg+Mc0cOySVKful
-dErocA36zzVcPdZ7D+BYBMkQAQHfuuHs+MPvC2jMysqFXW1I1aW3fBZ+xDeUZrK/
-4D/AcNDfmmeQE2wCgjsniNW67NEAUuMmUa/S+rlL0cDn1Pia/2yBfubTbhHEvWxA
-FY69CDg0bywMnqA7PBfSON5H3WdevD3zs313Mag9Zy+eoAITv8Q5Gv2EHYLbYaIa
-tKMiJ3vl+XqigygtUir/UsLnHE7dXQwBmLVxN/mWhpU4ot79woW5Al5oKdvdfHy0
-CqAGwzHRYPQVtblIYJC5W9BhZ1l5PcIkobdhCQYT1iGibMTiEyjdEVa0pw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAK4ZRjYBPQC0lBL2HMorIwHx4Zm/MA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTAeFw0xNzAzMTUxNTI2NDla
-Fw0zNzAzMTUxNTI2NDlaMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYukue0LoJYjbLSzvhG2rEkl4WB
-0BexAgaLOegD+4sZ8uMu/iqVU/CY5oyNmtNWpgK4PKWgOWAVXn61s30H80wqUarZ
-xuvzsQWoHcZDoJlcEfMcol7SU3IMY1HuslWkprsDcxrEQBh32zKb2QVz+VIHldeb
-JHOuiSTF6U2S/FZbL85HBFEJ/D2bLf2dn+Txs/dChMTmGkoq14Fvx6U0iaTXGSsP
-pCVyHPXvmhy19YgOh0NxUa3dmejJawSLAg7mvCWJNw9oMrh1nLvTCMzKa8mT5jY9
-KGMHbC/OROa/iVMjUWDcSenUclN8sQzKMSUZq0nBvtyQ+QkfCRIa0dTt0W0CAwEA
-AaNlMGMwHQYDVR0OBBYEFKOByX3ixO5csXU1uL/3+DfCO6SmMEIGA1UdEQQ7MDmC
-D2xvZ2luLml0LmxpdS5zZYYmaHR0cHM6Ly9sb2dpbi5pdC5saXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAH28tjQc9K6+XGkrEIngOAJYFooJ
-BXWPcOjcBktzCpBQEkwsBQUm49CyXmh/iUD19lBDaLeiHZfTCqc9ngfUbEoa6eZc
-882sounMumAd26GUouRo0NPOycXqjy60/lLYI8YnEg5QNiZhg+3DelIaZbMBPGF/
-pOI7/v5bNfrwAYq2/z2+AIffaaEElfxL29Af7LiFlyaD1POq2x7usHWejWzC0q+P
-dIIc188IIlVfFQJxJ0wl9wIb0Jkz7vwmWyo/KRre7YJTBXo5ig4i7qRuL5ZTHrTp
-iKFAgcegluwZn0xVjNzrTm7fD4zRUJ8SuHo+B42F3JvwrPKpEueEZSXpkZo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAM5tJLVR6quocWTQDzeuBTjcbIjgMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTAeFw0xNzAzMTUxNTI2NTBa
-Fw0zNzAzMTUxNTI2NTBaMBoxGDAWBgNVBAMMD2xvZ2luLml0LmxpdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYAhztRzpt3nvtV2ohqShSMu7zP
-AkV5EfgRf8jYT0AKbkts5WJh5OyaS2kZiRPlXM5uEh4OvoZrhQ/3ZgaeHibzx9/t
-8MO4zNpR/qth0xDtJcYDtqZtMSrXEeaYgAIX+UoqQlSMpQO8CWCkmqHWyWMcmld/
-LLC5K5AMUGx/ATE5dys/+QnuVAGjuAS1KGE8zarn0rUGBHMCmgsMflONqHYhW/L1
-++o9UzptvxrvJuJuF/r5f8rQU6dztlKGJeqkuf3HP9PEcAFseog9d1v/2MNic+R6
-66P3IgM+Yp3jzEeXgwAkA5FpGyHMLz4/O7dmz7rqbRTo4VB8WeF1/Mmosv8CAwEA
-AaNlMGMwHQYDVR0OBBYEFATiAWTWv1fBJuYIO0v7DJmM6C73MEIGA1UdEQQ7MDmC
-D2xvZ2luLml0LmxpdS5zZYYmaHR0cHM6Ly9sb2dpbi5pdC5saXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEMw6+CAAxRIxbGtebdkOTRQ2eQf
-hhrkRckGjuE4H3j1MrpkQzSaRqpowXaB9zqO1EZGA+AB8s2zbfMs0GXzD8rtmnKi
-YG7XvkoNPM9n5sTWyu64bEAZ+gTPgETDHCSwKIhHW+krZgkFFM1dZvQlcB0/FPG7
-yrnXkTsFVKk01ixFDyFizKc2fOryHuiKwRbmkdJvn0BIlpY/EXSz0VCrWmEyfYb5
-7NrUVEgiSfLs+HCyjIl5riIMiiucGo8jRZECpY+neVE6vP4pQWI1tCg4QfjwQAFf
-RZPA+Q2niYC920FIv6uscwfFJR4PEFBA83wLSZ39FDm79HM3TNQ9KFtgLY8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.it.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.it.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">LiU</OrganizationName>
-    <OrganizationName xml:lang="en">LiU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet - old</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University - old</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@liu.se</EmailAddress>
-    <TelephoneNumber>+46 13 282828</TelephoneNumber>
-  </ContactPerson>
-  <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>LiU Incident Response Team</GivenName>
-    <EmailAddress>mailto:abuse@liu.se</EmailAddress>
-    <TelephoneNumber>+46 13 281744</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml
deleted file mode 100644
index 85bc8a62..00000000
--- a/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,234 +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://login.test.it.liu.se/idp/shibboleth">
-  <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-support">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linköpings Universitet (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testidentitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Test Identity Provider for employees and students at Linköping University.</mdui:Description>
-        <mdui:Logo height="68" width="350">https://login.test.it.liu.se/images/logo/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="68" width="350">https://login.test.it.liu.se/images/logo/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="68" width="350">https://login.test.it.liu.se/images/logo/logo-350x68-en.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>liu.se</mdui:DomainHint>
-        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.36.54.0/24</mdui:IPHint>
-        <mdui:IPHint>192.36.93.0/24</mdui:IPHint>
-        <mdui:IPHint>192.36.94.0/24</mdui:IPHint>
-        <mdui:IPHint>192.12.235.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.86.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:4c::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.397836,15.576008</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:58.403479,15.622827</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:58.589874,16.176439</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.350824,18.143391</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAPnX7SmJwfxmgq0gnMtTEtq/GapJMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
-MjEzNloXDTM2MDkyMTEwMjEzNlowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
-aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFBFo6NO2WFR4K
-LmjqsFiJRFwkJ7A98o+wPy59W627iMmPznOs1+6zTW5qeJETmzaBmvjNw/26kQrz
-dDrpkVcowvDmRR4rDWja8TcnpZiTJmaZBHpwRGagyke0cA/mL7zemV4E6S1afMun
-mJh8+PqbEYfhzVFn0w5AzPA7EZrcZa7Bl2E+0D7BxwKDOoF5IIQHPxc6JbcQKlPe
-Wq7qudk7vlxFUCECagMxXinikp14f3mqF/2wDAb/8Bxm72puiqZfH3LDuxVGTsUN
-klFZCGb0WcX5rY968uGCQOQPzmS5zibsaqtccpTkpmj0fGMGk3mvCHoFRjBdjZvM
-GOFuHV9RAgMBAAGjbzBtMB0GA1UdDgQWBBSAoF+lmeQ/Pg7kyR36UrZNrxrb8TBM
-BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
-ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-ei9tRZlLCAzaxM1+Qr7QsKxX5KV4uPlnFZMV+sUs2c6gNjExyJMbXdWy92Z+BQhT
-y8msGro25wSomHEHY+Oy34e9W8fe2481M7xCdQoitGJfZREBpUN42pGFEzCPPK2A
-HSAMrh+izTL/crSbQX1KRlyXy2n75w4v4IRRkR8Q5/uL40OvXqHD//vqn5OLxZyq
-XnE9+OuzX+tzqyUsSxnbuiZeIO4RvtES8Z8jV+R8zbsqAJntBCREjX8IjMMrjOqV
-Q2rShyR2/rmM4FdYDvTeT2CS/mtLvHjcqhrnnyooFS8Cn6wKY1gYzWkXJ02wRbO3
-tx6vZWS6c4lQgs+Q2zdb5Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDETCCAfmgAwIBAgIJANDfvhcg8Z1SMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTExNDU0NVoXDTM2MDkx
-NjExNDU0NVowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5saXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr8zqZ+v3IFDjCC6UsASzdm6yTVaEs
-eTTs6U85e+Tfc2zoTOn8mxB8qRgcazmiZhYUfxg2engHsu/KsJ+xvf08pPvTH/5H
-d4DU+TOpevKLmJYH16A+1xXnJi9B5H28QEHNIUCR49+azgWrLy+Hwd5h+R6GL9Wr
-+0wlGmC0iZfEPhaKqVKXxyPq3EoMKtIPgiFBUeXdIwEWnJQZSwOq8//rgNA4ShEn
-eTzwxf84rfVo8ztLV7CU/t69NNcv4b8BAILE9nvw465hlmkiqsxsUbQk/U6k3kiw
-+VkfEiRJZqhz9sNv2x2b7m5aXLBH9h6mwjRwHwuYV2U9NU+jk6DVkgcJAgMBAAGj
-UDBOMB0GA1UdDgQWBBSELqFg/9+/XeobX9F2GTuWzkZ/5DAfBgNVHSMEGDAWgBSE
-LqFg/9+/XeobX9F2GTuWzkZ/5DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQByp838nFRFS+BehmwUUZSWdbHo6BcXcuKMCL2ADnWjKV1FMjvLlbzyyFl8
-bbTEEdUGpi5kyouJbMZyObr0BXvX3CZvoANdAJoN01z+35U4DoXGwevF5AjFt8m6
-4eYKGoL7fm6cbXR/EBpW7IDZUPl5S52ChnCVl6LPLAkaDFFmCG9vfYzb9p/Ay0Ia
-yqxIdplRaHbyykcA2vw7QclI5VoYwBEKwKig/5SFAXfs74QkOtMTkIpGBv/ECH5F
-f91hP1hqE59m9aIhTEHrmZMFmFgerXAsewRCSFs70Sucttv9IiTRxrj9JYMWBK4N
-UpYE3HavN9JHts63XvKCEfiptKe/
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAPJvGGG3PRGpj8/9g2ripJeFnDqqMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
-MjEzNFoXDTM2MDkyMTEwMjEzNFowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
-aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKiUPLthUZ7I8G
-hHO/Ekt0hyYAGFrWVbWTYmV3Y3T2G73LpqtznEWnRXuwXVExBtbstZ5ZFsWol7ac
-szaGimSaU/aANsDalFhQVuM3xYhCbQbkDq/3A1SQchciJxyR02gfRYVXLns9xLKc
-ZWVVJkeKeviyI3d4oX+GRYWb4Z6uG3NMuQ2Q2YNfqBkS6/9sj1vtliu1KiUOBYGS
-D5wIDlrJD8bcErWPOpWgS5F8d3LAb+OnwzpfSCP0s/ReA2OTDjQ5sDQPTHD8Ay/p
-u7WmTqlCSc2P/1q3CrYhNx8MlT56riXuJcYHpGlVj9W7BI84LrCjIDp4NCygPar1
-cEuers5fAgMBAAGjbzBtMB0GA1UdDgQWBBRI5PH2qRvZtOGRCGag0ZSNN+9HRjBM
-BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
-ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-ZHEv2vWK9Hbht44bXodv/QeMk8UbR7H2QL83gQLGB4UI8ZyWLgQ6SMydn3XTZN3a
-r5Gt0B1cXpZT6cbVD5OghdydR8XDndbCrf2McXi+xmPqt9CigbBj49jvVk/iSX1q
-4gKdCyp/oMNYi67alCHQoDhTg1rPBEwBSoYs33y/Qn4nq02eOO5M77SdrwxC2XwG
-WHS0O+aCDB6cUmqu3vihoNCSQd6XhhWziXf3ZX0NBUOgHAqP+1DHv5d/9co/0rWA
-YuL6+TdT8Df+TZZZsCcCqEXauHzNFYBVP9iu3ZCLRbtIimTeYtKA1DwIcKewBZBv
-+9LTW/kA/AILP1MSXxyCKg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.test.it.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.test.it.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.test.it.liu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.test.it.liu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.test.it.liu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAPnX7SmJwfxmgq0gnMtTEtq/GapJMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
-MjEzNloXDTM2MDkyMTEwMjEzNlowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
-aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFBFo6NO2WFR4K
-LmjqsFiJRFwkJ7A98o+wPy59W627iMmPznOs1+6zTW5qeJETmzaBmvjNw/26kQrz
-dDrpkVcowvDmRR4rDWja8TcnpZiTJmaZBHpwRGagyke0cA/mL7zemV4E6S1afMun
-mJh8+PqbEYfhzVFn0w5AzPA7EZrcZa7Bl2E+0D7BxwKDOoF5IIQHPxc6JbcQKlPe
-Wq7qudk7vlxFUCECagMxXinikp14f3mqF/2wDAb/8Bxm72puiqZfH3LDuxVGTsUN
-klFZCGb0WcX5rY968uGCQOQPzmS5zibsaqtccpTkpmj0fGMGk3mvCHoFRjBdjZvM
-GOFuHV9RAgMBAAGjbzBtMB0GA1UdDgQWBBSAoF+lmeQ/Pg7kyR36UrZNrxrb8TBM
-BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
-ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-ei9tRZlLCAzaxM1+Qr7QsKxX5KV4uPlnFZMV+sUs2c6gNjExyJMbXdWy92Z+BQhT
-y8msGro25wSomHEHY+Oy34e9W8fe2481M7xCdQoitGJfZREBpUN42pGFEzCPPK2A
-HSAMrh+izTL/crSbQX1KRlyXy2n75w4v4IRRkR8Q5/uL40OvXqHD//vqn5OLxZyq
-XnE9+OuzX+tzqyUsSxnbuiZeIO4RvtES8Z8jV+R8zbsqAJntBCREjX8IjMMrjOqV
-Q2rShyR2/rmM4FdYDvTeT2CS/mtLvHjcqhrnnyooFS8Cn6wKY1gYzWkXJ02wRbO3
-tx6vZWS6c4lQgs+Q2zdb5Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDETCCAfmgAwIBAgIJANDfvhcg8Z1SMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTExNDU0NVoXDTM2MDkx
-NjExNDU0NVowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5saXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr8zqZ+v3IFDjCC6UsASzdm6yTVaEs
-eTTs6U85e+Tfc2zoTOn8mxB8qRgcazmiZhYUfxg2engHsu/KsJ+xvf08pPvTH/5H
-d4DU+TOpevKLmJYH16A+1xXnJi9B5H28QEHNIUCR49+azgWrLy+Hwd5h+R6GL9Wr
-+0wlGmC0iZfEPhaKqVKXxyPq3EoMKtIPgiFBUeXdIwEWnJQZSwOq8//rgNA4ShEn
-eTzwxf84rfVo8ztLV7CU/t69NNcv4b8BAILE9nvw465hlmkiqsxsUbQk/U6k3kiw
-+VkfEiRJZqhz9sNv2x2b7m5aXLBH9h6mwjRwHwuYV2U9NU+jk6DVkgcJAgMBAAGj
-UDBOMB0GA1UdDgQWBBSELqFg/9+/XeobX9F2GTuWzkZ/5DAfBgNVHSMEGDAWgBSE
-LqFg/9+/XeobX9F2GTuWzkZ/5DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQByp838nFRFS+BehmwUUZSWdbHo6BcXcuKMCL2ADnWjKV1FMjvLlbzyyFl8
-bbTEEdUGpi5kyouJbMZyObr0BXvX3CZvoANdAJoN01z+35U4DoXGwevF5AjFt8m6
-4eYKGoL7fm6cbXR/EBpW7IDZUPl5S52ChnCVl6LPLAkaDFFmCG9vfYzb9p/Ay0Ia
-yqxIdplRaHbyykcA2vw7QclI5VoYwBEKwKig/5SFAXfs74QkOtMTkIpGBv/ECH5F
-f91hP1hqE59m9aIhTEHrmZMFmFgerXAsewRCSFs70Sucttv9IiTRxrj9JYMWBK4N
-UpYE3HavN9JHts63XvKCEfiptKe/
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAPJvGGG3PRGpj8/9g2ripJeFnDqqMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGxvZ2luLnRlc3QuaXQubGl1LnNlMB4XDTE2MDkyMTEw
-MjEzNFoXDTM2MDkyMTEwMjEzNFowHzEdMBsGA1UEAwwUbG9naW4udGVzdC5pdC5s
-aXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKiUPLthUZ7I8G
-hHO/Ekt0hyYAGFrWVbWTYmV3Y3T2G73LpqtznEWnRXuwXVExBtbstZ5ZFsWol7ac
-szaGimSaU/aANsDalFhQVuM3xYhCbQbkDq/3A1SQchciJxyR02gfRYVXLns9xLKc
-ZWVVJkeKeviyI3d4oX+GRYWb4Z6uG3NMuQ2Q2YNfqBkS6/9sj1vtliu1KiUOBYGS
-D5wIDlrJD8bcErWPOpWgS5F8d3LAb+OnwzpfSCP0s/ReA2OTDjQ5sDQPTHD8Ay/p
-u7WmTqlCSc2P/1q3CrYhNx8MlT56riXuJcYHpGlVj9W7BI84LrCjIDp4NCygPar1
-cEuers5fAgMBAAGjbzBtMB0GA1UdDgQWBBRI5PH2qRvZtOGRCGag0ZSNN+9HRjBM
-BgNVHREERTBDghRsb2dpbi50ZXN0Lml0LmxpdS5zZYYraHR0cHM6Ly9sb2dpbi50
-ZXN0Lml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-ZHEv2vWK9Hbht44bXodv/QeMk8UbR7H2QL83gQLGB4UI8ZyWLgQ6SMydn3XTZN3a
-r5Gt0B1cXpZT6cbVD5OghdydR8XDndbCrf2McXi+xmPqt9CigbBj49jvVk/iSX1q
-4gKdCyp/oMNYi67alCHQoDhTg1rPBEwBSoYs33y/Qn4nq02eOO5M77SdrwxC2XwG
-WHS0O+aCDB6cUmqu3vihoNCSQd6XhhWziXf3ZX0NBUOgHAqP+1DHv5d/9co/0rWA
-YuL6+TdT8Df+TZZZsCcCqEXauHzNFYBVP9iu3ZCLRbtIimTeYtKA1DwIcKewBZBv
-+9LTW/kA/AILP1MSXxyCKg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.test.it.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.test.it.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">LiU</OrganizationName>
-    <OrganizationName xml:lang="en">LiU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet (TEST)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 9edc7d5f..4f573cb0 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -7,7 +7,6 @@
   <xi:include href="swamid-2.0/idp.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.mah.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/login.it.liu.se-idp-shibboleth.xml"/>  
   <xi:include href="swamid-2.0/idp.hkr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 175ba3b5..9dfb823c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -41,7 +41,6 @@
   <xi:include href="swamid-2.0/sp-nya.bth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/accountcheckout.lnu.se.xml"/>
   <xi:include href="swamid-2.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/aktivering.db.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
@@ -121,7 +120,6 @@
   <xi:include href="swamid-2.0/mds.lan.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mds-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.liu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/account.liu.se-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/nagios-vm.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/its-pd0030.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nagios.nordu.net-shibboleth.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 5d860000..31fd15c4 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -35,7 +35,6 @@
   <xi:include href="swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.test.antagning.se-aws-idp.xml"/>