diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 75a591b5..dd303953 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -291,6 +291,9 @@
     <bean id="MultiPredicateMatcher" abstract="true"
         class="uk.org.ukfederation.mda.dom.saml.mdattr.MultiPredicateMatcher"/>
 
+    <bean id="NamespacesStrippingStage" abstract="true" parent="stage_parent"
+        class="uk.org.ukfederation.mda.dom.NamespacesStrippingStage"/>
+
     <bean id="RegistrationAuthorityMatcher" abstract="true"
         class="uk.org.ukfederation.mda.dom.saml.mdattr.RegistrationAuthorityMatcher"/>
     
@@ -342,6 +345,7 @@
     <bean id="wayf_namespace"       parent="String" c:_="http://sdss.ac.uk/2006/06/WAYF"/>
     <bean id="xenc_namespace"       parent="String" c:_="http://www.w3.org/2001/04/xmlenc#"/>
     <bean id="xenc11_namespace"     parent="String" c:_="http://www.w3.org/2009/xmlenc11#"/>
+    <bean id="xml_namespace"        parent="String" c:_="http://www.w3.org/XML/1998/namespace"/>
     <bean id="xs_namespace"         parent="String" c:_="http://www.w3.org/2001/XMLSchema"/>
     <bean id="xsi_namespace"        parent="String" c:_="http://www.w3.org/2001/XMLSchema-instance"/>
     <bean id="xsl_namespace"        parent="String" c:_="http://www.w3.org/1999/XSL/Transform"/>
@@ -1163,13 +1167,31 @@
                 <ref bean="populateRegistrationAuthorities"/>
 
                 <!--
-                    The following two namespaces are always stripped because they are
-                    specific to the UK registrar and can't be valid when imported from
-                    some other source.
+                    Strip all elements and attributes that are in namespaces
+                    other than the ones we accept from partners.
                 -->
-                <ref bean="stripUkfedlabelNamespace"/>
-                <ref bean="stripWayfNamespace"/>
-                
+                <bean id="whitelistImportedNamespaces" parent="NamespacesStrippingStage"
+                    p:id="whitelistImportedNamespaces" p:whitelisting="true">
+                    <property name="namespaces">
+                        <set>
+                            <ref bean="alg_namespace"/>
+                            <ref bean="ds_namespace"/>
+                            <ref bean="hoksso_namespace"/>
+                            <ref bean="icmd_namespace"/>
+                            <ref bean="idpdisc_namespace"/>
+                            <ref bean="init_namespace"/>
+                            <ref bean="md_namespace"/>
+                            <ref bean="mdattr_namespace"/>
+                            <ref bean="mdrpi_namespace"/>
+                            <ref bean="mdui_namespace"/>
+                            <ref bean="saml_namespace"/>
+                            <ref bean="shibmd_namespace"/>
+                            <ref bean="xenc_namespace"/>
+                            <ref bean="xml_namespace"/>
+                        </set>
+                    </property>
+                </bean>
+
                 <ref bean="cleanImport"/>
                 <ref bean="stripAAMDUI"/>
                 <ref bean="trimImportElementWhitespace"/>
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
deleted file mode 100644
index 7846ffea..00000000
--- a/mdx/cz_eduid/beans.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Common beans for this channel.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    default-lazy-init="true"
-    xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-    
-    <!--
-        Metadata locations:
-        
-        for SP (set of IdP only): https://metadata.eduid.cz/entities/eduid+idp
-        for IdP (set of SP only): https://metadata.eduid.cz/entities/eduid+sp
-        complete set of IdP and SP: https://metadata.eduid.cz/entities/eduid
-        
-        See: http://www.eduid.cz/wiki/en/eduid/tech/details/index
-    -->
-    
-    <!--
-        Location of various resources.
-    -->
-    <bean id="cz_eduid_productionAggregate_url" class="java.lang.String">
-        <constructor-arg value="https://metadata.eduid.cz/entities/eduid"/>
-    </bean>
-    <bean id="cz_eduid_edugainAggregate_url" class="java.lang.String">
-        <constructor-arg value="https://metadata.eduid.cz/entities/eduid2edugain"/>
-    </bean>
-    
-    <!--
-        Fetch the production aggregate.
-    -->
-    <bean id="cz_eduid_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="cz_eduid_productionAggregate">
-        <property name="DOMResource">
-            <bean parent="HTTPResource">
-                <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url"    ref="cz_eduid_productionAggregate_url"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <!--
-        Fetch the eduGAIN export aggregate.
-    -->
-    <bean id="cz_eduid_edugainAggregate" parent="DOMResourceSourceStage"
-        p:id="cz_eduid_edugainAggregate">
-        <property name="DOMResource">
-            <bean parent="HTTPResource">
-                <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url"    ref="cz_eduid_edugainAggregate_url"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <!--
-        Metadata signing certificate.
-    -->
-    <bean id="cz_eduid_signingCertificate" parent="X509CertificateFactoryBean">
-        <property name="certificateFile">
-            <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/cz_eduid/metadata.eduid.cz.crt.pem"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <!--
-        Check the signature on a document.
-    -->
-    <bean id="cz_eduid_checkSignature" parent="XMLSignatureValidationStage"
-        p:id="cz_eduid_checkSignature">
-        <property name="verificationCertificate" ref="cz_eduid_signingCertificate"/>
-        <property name="permittingEmptyReferences" value="true"/>
-    </bean>
-    
-    <!--
-        Remove the eduID.cz custom metadata tagging namespace.
-    -->
-    <bean id="cz_eduid_stripMetadataNamespace" parent="NamespaceStrippingStage"
-        p:id="cz_eduid_stripMetadataNamespace"
-        p:namespace="http://eduid.cz/schema/metadata/1.0"/>
-    
-    <!--
-        Fetch the production entities as a collection.
-    -->
-    <bean id="cz_eduid_productionEntities" parent="CompositeStage"
-        p:id="cz_eduid_productionEntities">
-        <property name="composedStages">
-            <list>
-                <ref bean="cz_eduid_productionAggregate"/>
-
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="cz_eduid_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-                
-                <ref bean="disassemble"/>
-                
-                <ref bean="cz_eduid_stripMetadataNamespace"/>
-            </list>
-        </property>
-    </bean>
-    
-    <!--
-        Fetch the eduGAIN export entities as a collection.
-    -->
-    <bean id="cz_eduid_edugainEntities" parent="CompositeStage"
-        p:id="cz_eduid_edugainEntities">
-        <property name="composedStages">
-            <list>
-                <ref bean="cz_eduid_edugainAggregate"/>
-                
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="cz_eduid_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-                
-                <ref bean="disassemble"/>
-                
-                <ref bean="cz_eduid_stripMetadataNamespace"/>
-            </list>
-        </property>
-    </bean>
-
-    <!--
-        Select primary export aggregate.
-    -->
-    <alias alias="cz_eduid_exportedAggregate" name="cz_eduid_edugainAggregate"/>
-    <alias alias="cz_eduid_exportedEntities"  name="cz_eduid_edugainEntities"/>
-</beans>
diff --git a/mdx/cz_eduid/metadata.eduid.cz.crt.pem b/mdx/cz_eduid/metadata.eduid.cz.crt.pem
deleted file mode 100644
index e9edd581..00000000
--- a/mdx/cz_eduid/metadata.eduid.cz.crt.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDCjCCAfICCQDeyJjos8lOlTANBgkqhkiG9w0BAQUFADBHMRIwEAYKCZImiZPy
-LGQBGRYCY3oxFTATBgoJkiaJk/IsZAEZFgVlZHVJRDEaMBgGA1UEAxMRbWV0YWRh
-dGEuZWR1SUQuY3owHhcNMTEwMjE3MjAyMDAwWhcNMjEwMjE0MjAyMDAwWjBHMRIw
-EAYKCZImiZPyLGQBGRYCY3oxFTATBgoJkiaJk/IsZAEZFgVlZHVJRDEaMBgGA1UE
-AxMRbWV0YWRhdGEuZWR1SUQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQD9Wg8jPOecHmHtpCEsNqJnQHXZr6bAKIXUFDZheKRqAi4PvMo6clWkl3sj
-MHbqmc+K4HnkGm1445CdxwJnmHsKHcnYrP/Zq0TiP5bydhRpna3c+YCX0alFlwop
-Dm3Pl9Nd/fBqMHXjihCsHYZOcM5UY2xW/x+wlhTX3jVSUO/WKhq3Ljae0m9f39R7
-DOAwMcaDY+2+9BlIx/Dz78z/LNOVEbzhxLaxt25PzA7Tw1cMfZ07LeER6w2OoQBS
-8kZY5aORLOiv3VRsF9LH4n0OGHx4Gxb8QsL8/H1xccfV+aweo4E9sZRGLF506O/+
-A567dQWdi4b5Oodtnd+hzEfn2cI1AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGHU
-6daImmTF7oPVakUtMTRJX+D1rUyw4UM4my6vLTQsm/qz5cq+rhglplCZCMOi/3Ll
-ncbrwwFudcn2lvda5KljVcZjoHS/eM8Q0mk0P77cOpAJUYOniUYLnRn84UiPYKTS
-70FMq6nIO38rRdSbqROZTqdnzOupOKHJgxZI4FFGzRCSfDEqW5YhlTnUUVMyD2YB
-zonXReSFbrhofcMbEDlJj/B7RVnqcCmQJRy28bqS6wK7uJpYNt1HQwASbAnrzUgO
-FIbaiwkFIyMuxjzSuXeyl2UDTtTlINECv7Y9FMgifwq2Fyms/TskZzvDEHvAsZxV
-bqg7GKeCsFXAnGL79xM=
------END CERTIFICATE-----
diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
deleted file mode 100644
index 1c65f95c..00000000
--- a/mdx/cz_eduid/verbs.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Verb definitions for this channel.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    default-lazy-init="true"
-    xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-    
-    <!--
-        Import commonly used beans.
-    -->
-    <import resource="classpath:common-beans.xml"/>
-        
-    <!--
-        Import channel-specific beans.
-    -->
-    <import resource="classpath:cz_eduid/beans.xml"/>
-    
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
-        <property name="outputFile">
-            <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/cz_eduid/imported.xml"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
-        <property name="stages">
-            <list>
-                <ref bean="cz_eduid_productionEntities"/>
-                <ref bean="standardImportActions"/>
-                <ref bean="standardImportTail"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
-        <property name="stages">
-            <list>
-                <ref bean="cz_eduid_productionAggregate"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="importEdugain" parent="SimplePipeline"
-        p:id="importEdugain">
-        <property name="stages">
-            <list>
-                <ref bean="cz_eduid_edugainEntities"/>
-                <ref bean="standardImportActions"/>
-                <ref bean="standardImportTail"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="importEdugainRaw" parent="SimplePipeline"
-        p:id="importEdugainRaw">
-        <property name="stages">
-            <list>
-                <ref bean="cz_eduid_edugainAggregate"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <alias alias="import"    name="importEdugain"/>
-    <alias alias="importRaw" name="importEdugainRaw"/>
-</beans>
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
deleted file mode 100644
index 9eb23676..00000000
--- a/mdx/hu_eduid/beans.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Common beans for this channel.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    default-lazy-init="true"
-    xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-    
-    <!--
-        Location of various resources.
-    -->
-    <bean id="hu_eduid_productionAggregate_url" class="java.lang.String">
-        <constructor-arg value="https://metadata.eduid.hu/current/href.xml"/>
-    </bean>
-    <bean id="hu_eduid_edugainAggregate_url" class="java.lang.String">
-        <constructor-arg value="https://metadata.eduid.hu/2011/href-edugain.xml"/>
-    </bean>
-    
-    <!--
-        Fetch the production aggregate.
-    -->
-    <bean id="hu_eduid_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="hu_eduid_productionAggregate">
-        <property name="DOMResource">
-            <bean parent="HTTPResource">
-                <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url"    ref="hu_eduid_productionAggregate_url"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <!--
-        Fetch the eduGAIN export aggregate.
-    -->
-    <bean id="hu_eduid_edugainAggregate" parent="DOMResourceSourceStage"
-        p:id="hu_eduid_edugainAggregate">
-        <property name="DOMResource">
-            <bean parent="HTTPResource">
-                <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url"    ref="hu_eduid_edugainAggregate_url"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <!--
-        Metadata signing certificate.
-    -->
-    <bean id="hu_eduid_signingCertificate" parent="X509CertificateFactoryBean">
-        <property name="certificateFile">
-            <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/hu_eduid/href-metadata-signer-2011.crt"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <!--
-        Check the signature on a document.
-    -->
-    <bean id="hu_eduid_checkSignature" parent="XMLSignatureValidationStage"
-        p:id="hu_eduid_checkSignature">
-        <property name="verificationCertificate" ref="hu_eduid_signingCertificate"/>
-    </bean>
-    
-    <!--
-        Remove the eduID.hu custom metadata tagging namespace.
-    -->
-    <bean id="hu_eduid_stripEntityAttributesNamespace" parent="NamespaceStrippingStage"
-        p:id="hu_eduid_stripEntityAttributesNamespace"
-        p:namespace="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info"/>
-
-    <!--
-        hu_eduid_check_regauth
-        
-        Any registrationAuthority already present on an entity in this
-        channel must match the known registration authority value.
-    -->
-    <bean id="hu_eduid_check_regauth" parent="check_regauth_parent"
-        p:id="hu_eduid_check_regauth">
-        <property name="transformParameters">
-            <map>
-                <entry key="expectedAuthority" value-ref="hu_eduid_registrar"/>
-            </map>
-        </property>
-    </bean>
-    
-    <!--
-        Fetch the production entities as a collection.
-    -->
-    <bean id="hu_eduid_productionEntities" parent="CompositeStage"
-        p:id="hu_eduid_productionEntities">
-        <property name="composedStages">
-            <list>
-                <ref bean="hu_eduid_productionAggregate"/>
-
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="hu_eduid_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-                
-                <ref bean="disassemble"/>
-                
-                <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
-                
-                <ref bean="hu_eduid_check_regauth"/>
-            </list>
-        </property>
-    </bean>
-    
-    <!--
-        Fetch the eduGAIN export entities as a collection.
-    -->
-    <bean id="hu_eduid_edugainEntities" parent="CompositeStage"
-        p:id="hu_eduid_edugainEntities">
-        <property name="composedStages">
-            <list>
-                <ref bean="hu_eduid_edugainAggregate"/>
-                
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="hu_eduid_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-                
-                <ref bean="disassemble"/>
-                
-                <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
-                
-                <ref bean="hu_eduid_check_regauth"/>
-            </list>
-        </property>
-    </bean>
-    
-    <!--
-        Select primary export aggregate.
-    -->
-    <alias alias="hu_eduid_exportedAggregate" name="hu_eduid_edugainAggregate"/>
-    <alias alias="hu_eduid_exportedEntities"  name="hu_eduid_edugainEntities"/>
-</beans>
diff --git a/mdx/hu_eduid/href-metadata-signer-2011.crt b/mdx/hu_eduid/href-metadata-signer-2011.crt
deleted file mode 100644
index 1d5f50c1..00000000
--- a/mdx/hu_eduid/href-metadata-signer-2011.crt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMCSFUx
-FzAVBgNVBAoTDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLExllZHVJRCBGZWRlcmF0
-aW9uIE9wZXJhdG9yMRgwFgYDVQQDEw9NZXRhZGF0YSBTaWduZXIxGjAYBgkqhkiG
-9w0BCQEWC2FhaUBuaWlmLmh1MB4XDTExMTAwNTA4MTg0NloXDTMxMDkzMDA4MTg0
-NlowgYAxCzAJBgNVBAYTAkhVMRcwFQYDVQQKEw5OSUlGIEluc3RpdHV0ZTEiMCAG
-A1UECxMZZWR1SUQgRmVkZXJhdGlvbiBPcGVyYXRvcjEYMBYGA1UEAxMPTWV0YWRh
-dGEgU2lnbmVyMRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAPRzY77JN44loezTsDnipWRVNRtupoXfdEUT
-+TutYG7Z74qTH2JGDEUEtVzctwL4Z53qqDAEoYZCNU0uJ6yYElhbWk6wQ2rXi/KF
-BXwsKW/Gcs83Law70X5mh9qaTRUWdngtkUDse1WKGE1DUKm9s4VrJtnBMXJg8Y3V
-ImXdPd2K1o40VT7TPe0yjjtbVX13Xg9vNMuXxD5YkawiSZ5BqJ1K1j3GEB/0DX0n
-pQItdVd/1Pu3IVSPkpZAknUIiMt3xQ1VzZSlipZrvLqa8cLf+/QePouOv91Axxuc
-VhN6Wc8J+i8qEZ117ygK6ifdoi8aNzQcyKDyakrTN6luttgejEkCAwEAAaOB4DCB
-3TAdBgNVHQ4EFgQUEttcbKAzsQaeczMxL0t7qYcGMYUwga0GA1UdIwSBpTCBooAU
-EttcbKAzsQaeczMxL0t7qYcGMYWhgYakgYMwgYAxCzAJBgNVBAYTAkhVMRcwFQYD
-VQQKEw5OSUlGIEluc3RpdHV0ZTEiMCAGA1UECxMZZWR1SUQgRmVkZXJhdGlvbiBP
-cGVyYXRvcjEYMBYGA1UEAxMPTWV0YWRhdGEgU2lnbmVyMRowGAYJKoZIhvcNAQkB
-FgthYWlAbmlpZi5odYIBATAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQCYot78JOcq84L5uE7vluqb6msXP7ifmhv6GPjhc1RB3bNkMyx/cj02ewyD+kEE
-39TfxKlwLew4Zt+Vc+V9YwlPcvciKd1NjdfGsaSUJ5pkrOylon2ubXLCr4EGt8fv
-TRXmNW4Ye6+QcO3tDyk2Tz5tVo9+6VsLYdGiIWSE9LViiYr63kXEJpnBeyLcyGsd
-WOLRHFa3u4QCvAJGiJXpWTGOaxIwHPAYw5Kfpns0EX+eliooaLEf0ZvJWGyCIOWT
-uyKcFvmWTLlRPwFT6qpXqROOlsDrqSD/rMgSpBbEA330oyNcLRyF8ZaT/48gxdBj
-i0FObSeW3thg/FR4Wle0gSpL
------END CERTIFICATE-----
-
diff --git a/mdx/hu_eduid/verbs.xml b/mdx/hu_eduid/verbs.xml
deleted file mode 100644
index d5514a4b..00000000
--- a/mdx/hu_eduid/verbs.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Verb definitions for this channel.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    default-lazy-init="true"
-    xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-    
-    <!--
-        Import commonly used beans.
-    -->
-    <import resource="classpath:common-beans.xml"/>
-        
-    <!--
-        Import channel-specific beans.
-    -->
-    <import resource="classpath:hu_eduid/beans.xml"/>
-    
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
-        <property name="outputFile">
-            <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/hu_eduid/imported.xml"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
-        <property name="stages">
-            <list>
-                <ref bean="hu_eduid_productionEntities"/>
-                <ref bean="standardImportActions"/>
-                <ref bean="standardImportTail"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
-        <property name="stages">
-            <list>
-                <ref bean="hu_eduid_productionAggregate"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="importEdugain" parent="SimplePipeline"
-        p:id="importEdugain">
-        <property name="stages">
-            <list>
-                <ref bean="hu_eduid_edugainEntities"/>
-                <ref bean="standardImportActions"/>
-                <ref bean="standardImportTail"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="importEdugainRaw" parent="SimplePipeline"
-        p:id="importEdugainRaw">
-        <property name="stages">
-            <list>
-                <ref bean="hu_eduid_edugainAggregate"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-    
-    <alias alias="import"    name="importEdugain"/>
-    <alias alias="importRaw" name="importEdugainRaw"/>
-</beans>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index e74b8bbf..9e7e9fc7 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -17,12 +17,6 @@
     -->
     <import resource="classpath:int_edugain/entity-blacklist.xml"/>
     
-    <!--
-        Import eduGAIN participant beans for namespace stripping stages.
-    -->
-    <import resource="classpath:cz_eduid/beans.xml"/>
-    <import resource="classpath:hu_eduid/beans.xml"/>
-    
     <!--
         Location of various resources.
     -->
@@ -110,12 +104,6 @@
                 
                 <ref bean="int_edugain_removeBlacklistedEntities"/>
 
-                <!--
-                    Strip participant-specific namespaces.
-                -->
-                <ref bean="cz_eduid_stripMetadataNamespace"/>
-                <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
-                
                 <!--
                     All eduGAIN entities should have mdrpi:RegistrationInfo elements, but
                     we can't check the actual values.
@@ -147,12 +135,6 @@
 
                 <ref bean="int_edugain_removeBlacklistedEntities"/>
                 
-                <!--
-                    Strip participant-specific namespaces.
-                -->
-                <ref bean="cz_eduid_stripMetadataNamespace"/>
-                <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
-
                 <!--
                     All eduGAIN entities should have mdrpi:RegistrationInfo elements, but
                     we can't check the actual values.
diff --git a/tools/ukf-mda/ukf-mda-0.8.7.jar b/tools/ukf-mda/ukf-mda-0.8.7.jar
deleted file mode 100644
index 39f3d9c5..00000000
Binary files a/tools/ukf-mda/ukf-mda-0.8.7.jar and /dev/null differ
diff --git a/tools/ukf-mda/ukf-mda-0.8.8.jar b/tools/ukf-mda/ukf-mda-0.8.8.jar
new file mode 100644
index 00000000..1b08b130
Binary files /dev/null and b/tools/ukf-mda/ukf-mda-0.8.8.jar differ