diff --git a/build.xml b/build.xml
index 604957fd..22d3b7bc 100644
--- a/build.xml
+++ b/build.xml
@@ -493,9 +493,6 @@
                     <fileset dir="${tools.mda}/lib">
                         <include name="*.jar"/>
                     </fileset>
-                    <fileset dir="${tools.dir}/ukf-mda">
-                        <include name="*.jar"/>
-                    </fileset>
                     <fileset dir="${tools.dir}/xalan/lib">
                         <include name="sdss-xalan-md-*.jar"/>
                     </fileset>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 2b2507b4..769d0b68 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -511,7 +511,7 @@
         
         Standard item identifier strategy.
     -->
-    <bean id="identificationStrategy" class="uk.org.ukfederation.mda.UKItemIdentificationStrategy">
+    <bean id="identificationStrategy" class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityItemIdentificationStrategy">
         <property name="ignoredRegistrationAuthorities">
             <set>
                 <ref bean="us_incommon_registrar"/>