diff --git a/build.xml b/build.xml
index 083c6411..8e10af4c 100644
--- a/build.xml
+++ b/build.xml
@@ -2685,7 +2685,7 @@
 
     <!--
         inc.mdq.generate.all.localkey
-
+    
         Generate all metadata required for the InCommon federation MDQ service
         using the local key configuration.
 
diff --git a/mdx/incommon/mdq-all-cloudhsm.xml b/mdx/incommon/mdq-all-cloudhsm.xml
index 2ddcb105..35a917d7 100644
--- a/mdx/incommon/mdq-all-cloudhsm.xml
+++ b/mdx/incommon/mdq-all-cloudhsm.xml
@@ -19,19 +19,6 @@
     <!-- Import mdq-all beans -->
     <import resource="classpath:incommon/mdq-all.xml" />
 
-<!--     This bean MUST be called "conversionService" to work properly -->
-<!--     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"> -->
-<!--         <property name="converters"> -->
-<!--             <set> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" /> -->
-<!--             </set> -->
-<!--         </property> -->
-<!--     </bean> -->
-
     <bean id="privateKeyFactory" class="uk.org.iay.incommon.mda.cloudhsm.CaviumPrivateKeyFactoryBean"
         p:username="${sign.keyUser}" p:password="${sign.keyPassword}" p:keyHandle="${sign.keyHandle}" />
 
diff --git a/mdx/incommon/mdq-all-localkey.xml b/mdx/incommon/mdq-all-localkey.xml
index f9a87501..01d1b22c 100644
--- a/mdx/incommon/mdq-all-localkey.xml
+++ b/mdx/incommon/mdq-all-localkey.xml
@@ -19,19 +19,6 @@
     <!-- Import mdq-all beans -->
     <import resource="classpath:incommon/mdq-all.xml" />
 
-<!--     This bean MUST be called "conversionService" to work properly -->
-<!--     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"> -->
-<!--         <property name="converters"> -->
-<!--             <set> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" /> -->
-<!--                 <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" /> -->
-<!--             </set> -->
-<!--         </property> -->
-<!--     </bean> -->
-
     <bean id="privateKeyFactory" parent="PrivateKeyFactoryBean" p:resource="${sign.keyResource}"
         p:privateKeyPassword="${sign.keyPassword}" />