diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 31cafb99c3..f5661c5a1a 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -3,24 +3,9 @@
 
 <beans>
 
-   <!-- Custom property editors -->	
-
-   <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-      <property name="propertyEditorRegistrars">
-         <list>
-            <ref bean="customPropertyEditorRegistrar"/>
-         </list>
-      </property>
-   </bean>
-
-   <bean id="customPropertyEditorRegistrar"
-         class="org.alfresco.module.org_alfresco_module_rm.util.CustomPropertyEditorRegistrar">
-      <property name="namespaceService" ref="NamespaceService"/>
-   </bean>
-   
-   <!--  Authentication Helper -->   
+   <!--  Authentication Helper -->
    <bean name="rm.authenticationUtil" class="org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil"/>
-   
+
    <!-- Import extended repository context -->
 
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/extended-repository-context.xml"/>
@@ -120,7 +105,7 @@
 
    <!--  Import report service -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-report-context.xml"/>
-   
+
    <!--  Import recordable version services -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-version-context.xml"/>
 
@@ -233,11 +218,4 @@
 
    <!-- Import the RM webscript's -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml"/>
-
-   <!--  Annotated behaviour bean post processor -->
-   <bean id="annotatedBehaviourBeanPostProcessor" class="org.alfresco.repo.policy.annotation.AnnotatedBehaviourPostProcessor">
-      <property name="policyComponent" ref="policyComponent" />
-      <property name="namespaceService" ref="namespaceService" />
-   </bean>
-
 </beans>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/CustomPropertyEditorRegistrar.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/CustomPropertyEditorRegistrar.java
deleted file mode 100644
index 48f3cfcc45..0000000000
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/CustomPropertyEditorRegistrar.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.util;
-
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.springframework.beans.PropertyEditorRegistrar;
-import org.springframework.beans.PropertyEditorRegistry;
-
-/**
- * Custom property editor registrar.
- * 
- * @author Roy Wetherall
- * @since 2.2
- */
-public class CustomPropertyEditorRegistrar implements PropertyEditorRegistrar
-{
-    /** namespace service */
-    private NamespaceService namespaceService;
-    
-    /**
-     * @param namespaceService  namespace service
-     */
-    public void setNamespaceService(NamespaceService namespaceService)
-    {
-        this.namespaceService = namespaceService;
-    }
-    
-    /**
-     * @see org.springframework.beans.PropertyEditorRegistrar#registerCustomEditors(org.springframework.beans.PropertyEditorRegistry)
-     */
-    @Override
-    public void registerCustomEditors(PropertyEditorRegistry registry)
-    {
-        // add custom QName editor
-        registry.registerCustomEditor(QName.class, new QNameTypeEditor(namespaceService));
-    }
-}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/QNameTypeEditor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/QNameTypeEditor.java
deleted file mode 100644
index 3b7c8b16fa..0000000000
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/QNameTypeEditor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.util;
-
-import java.beans.PropertyEditorSupport;
-
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-
-/**
- * QName type editor.
- *
- * @author Roy Wetherall
- * @since 2.2
- */
-public class QNameTypeEditor extends PropertyEditorSupport
-{
-    /** namespace service */
-    private NamespaceService namespaceService;
-
-    /**
-     * @param namespaceService  namespace service
-     */
-    public QNameTypeEditor(NamespaceService namespaceService)
-    {
-        this.namespaceService = namespaceService;
-    }
-
-    /**
-     * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
-     */
-    @Override
-    public void setAsText(String text)
-    {
-        // convert prefix string to QName
-        setValue(QName.createQName(text, namespaceService));
-    }
-}