diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
index cb657f5ed1..606136f40f 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
@@ -52,12 +52,10 @@ import org.alfresco.rest.framework.resource.content.BasicContentInfo;
 import org.alfresco.rest.framework.resource.content.BinaryResource;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.webscripts.WithResponse;
-import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
@@ -88,11 +86,8 @@ public class NodesEntityResource implements
     private static final String STATUS = "status";
     private static final String COMPLETED = "Completed";
     private static final String FOLDER = "folder";
-
     private Nodes nodes;
     private DirectAccessUrlHelper directAccessUrlHelper;
-    private SearchService searchService;
-    private ServiceRegistry serviceRegistry;
     private PermissionService permissionService;
     private NodeService nodeService;
     private ActionService actionService;
@@ -108,15 +103,9 @@ public class NodesEntityResource implements
         this.directAccessUrlHelper = directAccessUrlHelper;
     }
 
-    public void setSearchService(SearchService searchService)
+    public void setPermissionService(PermissionService permissionService)
     {
-        this.searchService = searchService;
-    }
-
-    public void setServiceRegistry(ServiceRegistry serviceRegistry)
-    {
-        this.serviceRegistry = serviceRegistry;
-        this.permissionService = serviceRegistry.getPermissionService();
+        this.permissionService = permissionService;
     }
 
     public void setNodeService(NodeService nodeService)
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceAction.java
index 3851727d80..6c2e4db36e 100644
--- a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceAction.java
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceAction.java
@@ -25,18 +25,13 @@
  */
 package org.alfresco.rest.framework.resource.actions.interfaces;
 
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.rest.framework.WebApiDescription;
-import org.alfresco.rest.framework.WebApiParam;
-import org.alfresco.rest.framework.WebApiParameters;
-import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.webscripts.WithResponse;
 
+import java.util.List;
+
 /**
  * Permissible actions for an Relationship Resources
  * Based around CRUD - Create, ReadAll, ReadById, Update, Delete, DeleteSet
diff --git a/remote-api/src/main/resources/alfresco/public-rest-context.xml b/remote-api/src/main/resources/alfresco/public-rest-context.xml
index dddc92113d..6fed535032 100644
--- a/remote-api/src/main/resources/alfresco/public-rest-context.xml
+++ b/remote-api/src/main/resources/alfresco/public-rest-context.xml
@@ -1148,8 +1148,7 @@
     <bean class="org.alfresco.rest.api.nodes.NodesEntityResource">
         <property name="nodes" ref="Nodes" />
         <property name="directAccessUrlHelper" ref="directAccessUrlHelper" />
-        <property name="searchService" ref="SearchService" />
-        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="permissionService" ref="permissionService"/>
         <property name="nodeService" ref="NodeService" />
         <property name="actionService" ref="ActionService"/>
         <property name="simpleCache" ref="folderSizeSharedCache" />
@@ -1775,5 +1774,4 @@
             </list>
         </property>
     </bean>
-
 </beans>
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java
index 47dffff196..330c92f7ef 100644
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeFolderSizeApiTest.java
@@ -102,7 +102,7 @@ public class NodeFolderSizeApiTest extends AbstractBaseApiTest
 
     /**
      * Test case for POST/calculate-folder-size, which calculates Folder Size.
-     * Test case for GET/get-folder-size, which calculates Folder Size.
+     * Test case for GET/get-folder-size, which receive Folder Size.
      * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/calculate-folder-size}
      * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/get-folder-size}
      */
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/InspectorTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/InspectorTests.java
index 85374ef1a6..646bae13b8 100644
--- a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/InspectorTests.java
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/InspectorTests.java
@@ -642,5 +642,4 @@ public class InspectorTests
         assertEquals(Status.STATUS_ACCEPTED,ResourceInspector.validSuccessCode(HttpMethod.PUT, Status.STATUS_ACCEPTED));
         assertEquals(Status.STATUS_NOT_MODIFIED,ResourceInspector.validSuccessCode(HttpMethod.DELETE, Status.STATUS_NOT_MODIFIED));
     }
-
 }