SWAMID-1140 SWAMID-1141 Updated adfs.hv.se remove idp.hv.se

3 files changed, 66 insertions, 297 deletions

diff --git a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
index 96e42f87..dedc51ed 100644
--- a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
@@ -5,17 +5,17 @@
       <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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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: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>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla: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-support">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.hv.se/adfs/services/trust">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.hv.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
@@ -28,6 +28,8 @@
         <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mdata.hv.se/privacy/English_Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mdata.hv.se/privacy/Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>hv.se</mdui:DomainHint>
@@ -38,60 +40,59 @@
         <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
         <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC1jCCAb6gAwIBAgIQQD1mKJV28YVPnv1GYDnHijANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmh2LnNlMB4XDTIxMTAwMTIzMjMwNloXDTI2MTAwMjIzMjMwNlowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5odi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqp223FioMTfHSwbGQkNsH49AG6PXZXICvUcF0Fzw1Yxb0f3MvIenWqPTx9Gg3+YNNo1m4oGMW5tpgK4XGQya6WADG88zsvq1POXA8C5UHmuoYNUAjDF+BnoZ1h7r8n6b77vfp7ZeNWwNd05HCXiI18XiyOhmqiJWNob3bSd/F4votkvGZserhsITmbbtjqaxdCF221rFT/GBLlif0NhBr+QnaT3v9F+CHAz5hNcVBb2SpmtlU51yM8BGen/WDK5nMrrywNF6hlCaNUq9ZXiLKenjjAuySIDr+bip8EKB28mEF4X9maSz3FFVbQIfs/ZVhTA/QhZDVeIfHWWLBp880CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH3ykJ/a+LVFpxZBmPAEodahHZfHkZQPKk9Q6TBvKhciCHqFSZAK5ab4m4562nNtMYOBLpT+4fVFSeO1Yxni8jeg1F6d0PKdSUKaVBomtE6m/i9A+Zv7+dB7c67n0x9YUQZR8I/QYbY6+GzYags02Dp/P2NlbJnf3QpdDc+8H9Yp106ojZS2IEcl2JFDVUidxDZ/12Et4rTHtXm7vAElXpjQFpDYarHNlIL8SYgkxBarDp31GQ1AJFqt6vlbTOMfsDvuSD+LTkvY/qtm8ECSbIE6XPECExwza26fGB8OtkMvAexCFnhxtO1rUiCyMOupKeTD7Iz/6kfpjGM22blBUeg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0DCCAbigAwIBAgIQYVSgGXMGo7tNpEOpjflV2TANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmh2LnNlMB4XDTIwMTAyMTE4MjE0MVoXDTIxMTAyMTE4MjE0MVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5odi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSyjOS0fx9BlOEQVBn2590WSGgN8rpPhn0ZfjS1FfQqs/8RS2JwqmeLAQdsrAyY/8wwSL9GArjrJRDPlyDdJkyZ5/f+DAvcQTSVXdw0YfxusVxrupP7aIeQ88EaAc4nsF4/tVi+NAtLOdtTPi9d3G7Z/eTatBa++9Ve35UhORusTO66tTsgi0ZKNTBuuNA0KSSbe08hVQWpcqXr1uAMyca4WjvbtHfXj7MkO9EVtxSbYgDlJMoVkELAr8nHVfOiurLZuhSfCyLsqgMcDQ6ecCh18ebw1afrvDe/ACW2jOzYgdL8gxTbRWDVfWwdxJxEWYbRpTtwS+iuVuvZ3GQcSvkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEATIabqvMN/OjR2w3aQ7ku3ynnZ7fopyocUW45qP6O2gQUwdqjprr8dy2QgVO0uar+G3wOw2EfOYzBEHKSbPcbM4iVVT+r+ol0MMJk4qIZE1Njk9Npi9LGBsQ62T6H0xp/ajjbwugaSWL/CYHLu1MCYvNFQ4f6Q2aCGyCkEiQRbdCr5e+D0aDqnCcZpENLODvJwpnJG2KcXhtprX7OunOdY8xzmw2F57qiuzapIY52KaQmc996ylCXVYks0c+ltFaskUHvSmflYUwKYCt8PB85MNTWqy7novChba8gjlbRedarBaY2Px9/DshMohSJVYMEUeTTcNHmtchGlz3WhTrnyA==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0DCCAbigAwIBAgIQGCD5tJxpdrNE0L8Su+YtXjANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmh2LnNlMB4XDTIxMTAwMTIzMjMwN1oXDTI2MTAwMjIzMjMwN1owJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5odi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJAHPf7Yn5Sj8oSWAttULLiyVKhCQFqzjB6QW2KM2qUdCvJ955DIF8Vskkf92GAysphTHw8S10zVOPphQxXlR16dIAv+WN/CBtInlemWB0xw0x0QmKdJxn1VVo4uDhSPQxnZy/G2c0AY2Ple+neUL5Stn52LAWoV8YV5TdNhlg9gdBmf+61LoZFihY8DFcfbza7xI/vZ54cSYYGVeb+K6FTzRqMD/oDinBycmUZ04tFeE3f/aCQvStfeWUfHsELqPmvXPWf8ieFSukGrCt9KCA7H0fP/uqsiWHGmvKnzB4U34jooGQ/jHtV4V7P3NVrKylcN9wNXTu7BKaaECj3N2UCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQJ/Ta1T4j2iWorXl9J9ftXw46XocthZtK8SzfWJX0Eh3wz7Vv/UI+J8uSL7up8qPUuqQnNlz3DDiXwxC40MvmqH3m4ZyaB5k9u1LY8L5F4Td/CXt+MVAc5Oj28xlgFSTZ152vvY+KoiVlXfxIxcipykHN8He2cRLY0PkLjtx6EKyNeF3LAOSCLM3k4QMa+4w+fphkCQ3ifn6aEeWYtc9a+gihyoyiW2nI9+j/Nmi8qamqpBy0HCMto0FOGUqnOGrCJAr2iGU8w5ipV7IHnYrcYb8Essx2ajpDluQC1kCQS9QWC+e8g4yCxBD/lORCC0TIwc54lS+tQKcv/suCTLkw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">HV</OrganizationName>
-    <OrganizationName xml:lang="en">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University West</Company>
-    <SurName>Magnus Andersson</SurName>
-    <EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
-    <TelephoneNumber>+46 520 223193</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University West</Company>
-    <SurName>Christian Jiresjö</SurName>
-    <EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
-    <TelephoneNumber>+46 520 223189</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University West</Company>
-    <SurName>Servicedesk Högkoslan Väst</SurName>
-    <EmailAddress>mailto:servicecenter@hv.se</EmailAddress>
-    <TelephoneNumber>+46 520 223300</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQQD1mKJV28YVPnv1GYDnHijANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmh2LnNlMB4XDTIxMTAwMTIzMjMwNloXDTI2MTAwMjIzMjMwNlowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5odi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqp223FioMTfHSwbGQkNsH49AG6PXZXICvUcF0Fzw1Yxb0f3MvIenWqPTx9Gg3+YNNo1m4oGMW5tpgK4XGQya6WADG88zsvq1POXA8C5UHmuoYNUAjDF+BnoZ1h7r8n6b77vfp7ZeNWwNd05HCXiI18XiyOhmqiJWNob3bSd/F4votkvGZserhsITmbbtjqaxdCF221rFT/GBLlif0NhBr+QnaT3v9F+CHAz5hNcVBb2SpmtlU51yM8BGen/WDK5nMrrywNF6hlCaNUq9ZXiLKenjjAuySIDr+bip8EKB28mEF4X9maSz3FFVbQIfs/ZVhTA/QhZDVeIfHWWLBp880CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH3ykJ/a+LVFpxZBmPAEodahHZfHkZQPKk9Q6TBvKhciCHqFSZAK5ab4m4562nNtMYOBLpT+4fVFSeO1Yxni8jeg1F6d0PKdSUKaVBomtE6m/i9A+Zv7+dB7c67n0x9YUQZR8I/QYbY6+GzYags02Dp/P2NlbJnf3QpdDc+8H9Yp106ojZS2IEcl2JFDVUidxDZ/12Et4rTHtXm7vAElXpjQFpDYarHNlIL8SYgkxBarDp31GQ1AJFqt6vlbTOMfsDvuSD+LTkvY/qtm8ECSbIE6XPECExwza26fGB8OtkMvAexCFnhxtO1rUiCyMOupKeTD7Iz/6kfpjGM22blBUeg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQGCD5tJxpdrNE0L8Su+YtXjANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmh2LnNlMB4XDTIxMTAwMTIzMjMwN1oXDTI2MTAwMjIzMjMwN1owJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5odi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJAHPf7Yn5Sj8oSWAttULLiyVKhCQFqzjB6QW2KM2qUdCvJ955DIF8Vskkf92GAysphTHw8S10zVOPphQxXlR16dIAv+WN/CBtInlemWB0xw0x0QmKdJxn1VVo4uDhSPQxnZy/G2c0AY2Ple+neUL5Stn52LAWoV8YV5TdNhlg9gdBmf+61LoZFihY8DFcfbza7xI/vZ54cSYYGVeb+K6FTzRqMD/oDinBycmUZ04tFeE3f/aCQvStfeWUfHsELqPmvXPWf8ieFSukGrCt9KCA7H0fP/uqsiWHGmvKnzB4U34jooGQ/jHtV4V7P3NVrKylcN9wNXTu7BKaaECj3N2UCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQJ/Ta1T4j2iWorXl9J9ftXw46XocthZtK8SzfWJX0Eh3wz7Vv/UI+J8uSL7up8qPUuqQnNlz3DDiXwxC40MvmqH3m4ZyaB5k9u1LY8L5F4Td/CXt+MVAc5Oj28xlgFSTZ152vvY+KoiVlXfxIxcipykHN8He2cRLY0PkLjtx6EKyNeF3LAOSCLM3k4QMa+4w+fphkCQ3ifn6aEeWYtc9a+gihyoyiW2nI9+j/Nmi8qamqpBy0HCMto0FOGUqnOGrCJAr2iGU8w5ipV7IHnYrcYb8Essx2ajpDluQC1kCQS9QWC+e8g4yCxBD/lORCC0TIwc54lS+tQKcv/suCTLkw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
+    <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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University West</md:Company>
+    <md:SurName>Magnus Andersson</md:SurName>
+    <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University West</md:Company>
+    <md:SurName>Christian Jiresjö</md:SurName>
+    <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University West</md:Company>
+    <md:SurName>Servicedesk Högkoslan Väst</md:SurName>
+    <md:EmailAddress>mailto:servicecenter@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University West</md:Company>
+    <md:GivenName>Incident Response Team</md:GivenName>
+    <md:SurName>IRT</md:SurName>
+    <md:EmailAddress>mailto:irt@hv.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hv.se-idp-shibboleth.xml b/swamid-2.0/idp.hv.se-idp-shibboleth.xml
deleted file mode 100644
index 75055d06..00000000
--- a/swamid-2.0/idp.hv.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,231 +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://idp.hv.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-26T15:38:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/hide-from-discovery</samla:AttributeValue>
-      </samla:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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: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" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hv.se/idp/shibboleth">
-    <Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan Väst - OLD</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University West - OLD</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="103" width="200">https://logo.hv.se/logo-sv.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hv.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.234.0/23</mdui:IPHint>
-        <mdui:IPHint>193.10.236.0/23</mdui:IPHint>
-        <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUAXeZdelXVp26C26pRdr1QlN9jkUwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmh2LnNlMB4XDTE3MDQxMTExMzQzMFoXDTM3MDQx
-MTExMzQzMFowFDESMBAGA1UEAwwJaWRwLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAmvsFBmRRFsfc7Qau+A9RYlG2vAmOK/K6c3xHi0oVgdr+
-ue+jcgpYa7hhsKUsoaXrgiXq8VEFK/sv1+Xk4BxBIVjOoHq85+0UXpiwztzAs+sl
-x7+tug42LfoxobtTmNZmo3ZVmRiK4X5kk38ZTatdHIJxW4k6ImJaDKJZyHajS0VS
-PF4iriQVlt0FyA2acEXcvicOm3Jk1GutcemkAy6zfTwoqa+b0taDvGadB9TvcnkG
-IXsNU2R8IdcDqhKv6y7JFCJFa90Ww2mxf8+o8EivIO5qkog8avi9FP8hryn3Onyl
-QdP5/CqxTUoLVdQpZps4jH2f2838a2hMXSnFXR+lVQIDAQABo1kwVzAdBgNVHQ4E
-FgQUpHjF17Iyv1nXBWE4pbzbbTO6UYQwNgYDVR0RBC8wLYIJaWRwLmh2LnNlhiBo
-dHRwczovL2lkcC5odi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEADQWRNGyYa/ITiex/eWEIxmzvNPpWe33fYOIQmG1YcNCAecwbeMSJ6qPnjLPS
-CLUaeI2SKp+58c5jNZXymH6guYwLFEwkzyIOw359oGEOy2FDPgeSGOTEyZoH0YrH
-DUYvvomaqqTJ3uRvqti0l1uRtohfzFYTlkeeoFuctXUGu6p+FkcRz6p1hyrYscJS
-1MZPJmzmwY1JX7TmFfRRUuLTEGPtEauyZ7afnCnrrW3pS9MYo/3+btI8zfA+y99u
-Y3yNwz5VtKXHkMPLThGNPnCzaSP14qQKn5IIk0HvSQ7kvsNGLeo5z0TIYwz/BDQb
-60ludwpg8oPEmtE6NpHxD6JBhw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUFIvWVmXUBPI2abbFMl23kNqoQZ4wDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmh2LnNlMB4XDTE3MDQxMTExMzQyOFoXDTM3MDQx
-MTExMzQyOFowFDESMBAGA1UEAwwJaWRwLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAg/9VJb5BhMpzS7jelC3lkIRO/LIrfcmUfzd8M0cd7L5m
-aAfX7GLsxqFsWwfthR82knDrsfkVRFvpj5fFYq6JJdYnWc4nAeoSeY8+bJZhyv4/
-is2cQJSaU9XFnekKRZgKw0Pqdkn61JyXU+oP/Jyrc1r8ToGyDxs+9ymuFm5qGNnT
-iGgM/20b48dFA5n6dIecOfhAuCIclwMcG9kWBBe71DpQfVmYIarLKZ9ba4+ZbOCo
-2CVIkCm7w1L3xdXbtkdgx+M1EX73fOQFEqgxMbU356yDoPSFtYzt4nSrINj/r5aB
-wMlFXX4i6QCtDPal6IVTo1aQ8XygrWuwabJbAGDxsQIDAQABo1kwVzAdBgNVHQ4E
-FgQU/ysBWkRm2m8SJU4DhSLImh9KErQwNgYDVR0RBC8wLYIJaWRwLmh2LnNlhiBo
-dHRwczovL2lkcC5odi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAN2LVqZMpo4iHzqbPSWvI3xAHu01unoettB6QEbtuTbn8Tda75sDEd7jiHoS+
-7UhXXuRFBH8InSKOBPJMfWd/1X0f75H4Duc/UPqpTPwSfS69aXggT2g61bRh3w5c
-A61nKHUOn/CXgLQxJ/ZEX8P1gXIEjd0nmS/NR/lD4Qy3lAxa/ps5QuA6dC4bs4r3
-qWQzqMmVknsW2AsFSwt5oJO5RybeiRlxWCw0aQxM+Ub6cua7zrInukZCvyJHZ8v4
-fOpklFtyEpq6PS+kEqCjmhUr76UPHTCgUOFBe8NYec57LiHHTxeQKJbSyz9dHdgl
-gdeJ8+QL17bYf1QlwOj2GvjdsA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUBi4s9Yt6WvyCB9AlWCIUnaSRUpcwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmh2LnNlMB4XDTE3MDQxMTExMzQyOVoXDTM3MDQx
-MTExMzQyOVowFDESMBAGA1UEAwwJaWRwLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAxVmKnlbx6goRWxWJFqNYiGKv8mVie+PdE1a7Bwt5IwMa
-YFNmNGnvMSSoUsDSu24DjRSY0Xrt6O/saVQ9D2NPomNq1DhmI1ZajV9J/w9P/AuT
-AgQw1Gt8fcfiFDIBbdA55Xn3988xPKhuScixEZNHfz9/haRWa4Yb2nOfMV+LgFmW
-eGSwKzsKjmSpEzz2FLL+ObmSoZPPkZ0zRkLu5jBHPaY/+b6M++iS6KZEv5Am3Ue4
-Efv7CklHj9li9e7skdekiqOySjOTRyeYV15TO0Nrk3NPy1vcrsWEh68Xx25EU3rM
-Q6Ejosp9JvLsZ3JSMm2Ly8pvxWgtjV9yy5cpZT8ZrQIDAQABo1kwVzAdBgNVHQ4E
-FgQU0nRt3SJ3P27MMfkVYVzkcSrBKq8wNgYDVR0RBC8wLYIJaWRwLmh2LnNlhiBo
-dHRwczovL2lkcC5odi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAdqwfSswenBdCmSiay/BEKe/RESHyxN/tR5LrypI4LlNUJrbpwkMAuqJEs1r9
-yOjPvchc5L0jhzhr+KgRWV3xb7jagQpIMvcGNF+8XjAihF+DAPEPF1ad4YyQWe01
-72mhfoQ91kum6odFaBYn4vO9VLvu8W4oOq+l/yy8h/e36gWWGzTE3Q9Fy3QR8eGn
-0cS7sajyAwHpL5hhkUcEg5Fgpl+owIXn91CajFuMfDOQcq/U3VZvUdKWN/MfN3ry
-AMKufcHTKXl06MadHAGvU9BeMB65jYUrKxduGN2Lzf870I7BublCeo8mP+K2e15s
-UPUl28rgefbQLT1QQewXqiTPqg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hv.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://idp.hv.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hv.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hv.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">hv.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUAXeZdelXVp26C26pRdr1QlN9jkUwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmh2LnNlMB4XDTE3MDQxMTExMzQzMFoXDTM3MDQx
-MTExMzQzMFowFDESMBAGA1UEAwwJaWRwLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAmvsFBmRRFsfc7Qau+A9RYlG2vAmOK/K6c3xHi0oVgdr+
-ue+jcgpYa7hhsKUsoaXrgiXq8VEFK/sv1+Xk4BxBIVjOoHq85+0UXpiwztzAs+sl
-x7+tug42LfoxobtTmNZmo3ZVmRiK4X5kk38ZTatdHIJxW4k6ImJaDKJZyHajS0VS
-PF4iriQVlt0FyA2acEXcvicOm3Jk1GutcemkAy6zfTwoqa+b0taDvGadB9TvcnkG
-IXsNU2R8IdcDqhKv6y7JFCJFa90Ww2mxf8+o8EivIO5qkog8avi9FP8hryn3Onyl
-QdP5/CqxTUoLVdQpZps4jH2f2838a2hMXSnFXR+lVQIDAQABo1kwVzAdBgNVHQ4E
-FgQUpHjF17Iyv1nXBWE4pbzbbTO6UYQwNgYDVR0RBC8wLYIJaWRwLmh2LnNlhiBo
-dHRwczovL2lkcC5odi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEADQWRNGyYa/ITiex/eWEIxmzvNPpWe33fYOIQmG1YcNCAecwbeMSJ6qPnjLPS
-CLUaeI2SKp+58c5jNZXymH6guYwLFEwkzyIOw359oGEOy2FDPgeSGOTEyZoH0YrH
-DUYvvomaqqTJ3uRvqti0l1uRtohfzFYTlkeeoFuctXUGu6p+FkcRz6p1hyrYscJS
-1MZPJmzmwY1JX7TmFfRRUuLTEGPtEauyZ7afnCnrrW3pS9MYo/3+btI8zfA+y99u
-Y3yNwz5VtKXHkMPLThGNPnCzaSP14qQKn5IIk0HvSQ7kvsNGLeo5z0TIYwz/BDQb
-60ludwpg8oPEmtE6NpHxD6JBhw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUFIvWVmXUBPI2abbFMl23kNqoQZ4wDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmh2LnNlMB4XDTE3MDQxMTExMzQyOFoXDTM3MDQx
-MTExMzQyOFowFDESMBAGA1UEAwwJaWRwLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAg/9VJb5BhMpzS7jelC3lkIRO/LIrfcmUfzd8M0cd7L5m
-aAfX7GLsxqFsWwfthR82knDrsfkVRFvpj5fFYq6JJdYnWc4nAeoSeY8+bJZhyv4/
-is2cQJSaU9XFnekKRZgKw0Pqdkn61JyXU+oP/Jyrc1r8ToGyDxs+9ymuFm5qGNnT
-iGgM/20b48dFA5n6dIecOfhAuCIclwMcG9kWBBe71DpQfVmYIarLKZ9ba4+ZbOCo
-2CVIkCm7w1L3xdXbtkdgx+M1EX73fOQFEqgxMbU356yDoPSFtYzt4nSrINj/r5aB
-wMlFXX4i6QCtDPal6IVTo1aQ8XygrWuwabJbAGDxsQIDAQABo1kwVzAdBgNVHQ4E
-FgQU/ysBWkRm2m8SJU4DhSLImh9KErQwNgYDVR0RBC8wLYIJaWRwLmh2LnNlhiBo
-dHRwczovL2lkcC5odi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAN2LVqZMpo4iHzqbPSWvI3xAHu01unoettB6QEbtuTbn8Tda75sDEd7jiHoS+
-7UhXXuRFBH8InSKOBPJMfWd/1X0f75H4Duc/UPqpTPwSfS69aXggT2g61bRh3w5c
-A61nKHUOn/CXgLQxJ/ZEX8P1gXIEjd0nmS/NR/lD4Qy3lAxa/ps5QuA6dC4bs4r3
-qWQzqMmVknsW2AsFSwt5oJO5RybeiRlxWCw0aQxM+Ub6cua7zrInukZCvyJHZ8v4
-fOpklFtyEpq6PS+kEqCjmhUr76UPHTCgUOFBe8NYec57LiHHTxeQKJbSyz9dHdgl
-gdeJ8+QL17bYf1QlwOj2GvjdsA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUBi4s9Yt6WvyCB9AlWCIUnaSRUpcwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmh2LnNlMB4XDTE3MDQxMTExMzQyOVoXDTM3MDQx
-MTExMzQyOVowFDESMBAGA1UEAwwJaWRwLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAxVmKnlbx6goRWxWJFqNYiGKv8mVie+PdE1a7Bwt5IwMa
-YFNmNGnvMSSoUsDSu24DjRSY0Xrt6O/saVQ9D2NPomNq1DhmI1ZajV9J/w9P/AuT
-AgQw1Gt8fcfiFDIBbdA55Xn3988xPKhuScixEZNHfz9/haRWa4Yb2nOfMV+LgFmW
-eGSwKzsKjmSpEzz2FLL+ObmSoZPPkZ0zRkLu5jBHPaY/+b6M++iS6KZEv5Am3Ue4
-Efv7CklHj9li9e7skdekiqOySjOTRyeYV15TO0Nrk3NPy1vcrsWEh68Xx25EU3rM
-Q6Ejosp9JvLsZ3JSMm2Ly8pvxWgtjV9yy5cpZT8ZrQIDAQABo1kwVzAdBgNVHQ4E
-FgQU0nRt3SJ3P27MMfkVYVzkcSrBKq8wNgYDVR0RBC8wLYIJaWRwLmh2LnNlhiBo
-dHRwczovL2lkcC5odi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAdqwfSswenBdCmSiay/BEKe/RESHyxN/tR5LrypI4LlNUJrbpwkMAuqJEs1r9
-yOjPvchc5L0jhzhr+KgRWV3xb7jagQpIMvcGNF+8XjAihF+DAPEPF1ad4YyQWe01
-72mhfoQ91kum6odFaBYn4vO9VLvu8W4oOq+l/yy8h/e36gWWGzTE3Q9Fy3QR8eGn
-0cS7sajyAwHpL5hhkUcEg5Fgpl+owIXn91CajFuMfDOQcq/U3VZvUdKWN/MfN3ry
-AMKufcHTKXl06MadHAGvU9BeMB65jYUrKxduGN2Lzf870I7BublCeo8mP+K2e15s
-UPUl28rgefbQLT1QQewXqiTPqg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">HV</OrganizationName>
-    <OrganizationName xml:lang="en">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University West</Company>
-    <SurName>Magnus Andersson</SurName>
-    <EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
-    <TelephoneNumber>+46 520 223193</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University West</Company>
-    <SurName>Christian Jiresjö</SurName>
-    <EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
-    <TelephoneNumber>+46 520 223189</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University West</Company>
-    <SurName>Servicedesk Högkoslan Väst</SurName>
-    <EmailAddress>mailto:servicecenter@hv.se</EmailAddress>
-    <TelephoneNumber>+46 520 223300</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 88840711..509c17f2 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -52,7 +52,6 @@
   <xi:include href="swamid-2.0/adfs.sp.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/fs.bth.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/login2.fhs.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fds.idp.hhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/adfs.ju.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>