diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
index 2b95bf725c..2ea2ccc8b5 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
@@ -22,6 +22,7 @@ audit.rm.enabled=true
 # Extended permission service cache sizing
 #
 cache.writersSharedCache.maxItems=10000
+cache.writersSharedCache.cluster.type=fully-distributed
 
 #
 # Global RM admin default bootstrap details
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
index 1d3b2b75c8..b284a10522 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
@@ -70,9 +70,9 @@
         </property>
     </bean>
 
-    <bean name="writersSharedCache" class="org.alfresco.repo.cache.DefaultSimpleCache">
-      <property name="maxItems" value="${cache.writersSharedCache.maxItems}"/>
-    </bean>
+   <bean name="writersSharedCache" factory-bean="cacheFactory" factory-method="createCache">
+      <constructor-arg value="cache.writersSharedCache"/>
+   </bean>
 
     <bean name="writersCache" class="org.alfresco.repo.cache.TransactionalCache">
       <property name="sharedCache">
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index dbef236772..66a794a352 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -181,25 +181,6 @@
          <version>${alfresco.base.version}</version>
          <type>zip</type>
       </dependency>
-      <!-- 'config' dependencies -->
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-data-model</artifactId>
-         <version>${alfresco.base.version}</version>
-         <classifier>config</classifier>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-repository</artifactId>
-         <version>${alfresco.base.version}</version>
-         <classifier>config</classifier>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-remote-api</artifactId>
-         <version>${alfresco.base.version}</version>
-         <classifier>config</classifier>
-      </dependency>
       <!-- Test dependencies -->
       <dependency>
          <groupId>junit</groupId>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java
index 96fb691229..4d51c1843c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanService.java
@@ -27,8 +27,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 
-import com.hazelcast.impl.Node;
-
 /**
  * File plan service interface.
  *