diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index a296fe6376..7bb49867e6 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -427,7 +427,6 @@ public class BrowseBean implements IContextListener
       node.addPropertyResolver("fileType16", this.resolverFileType16);
       node.addPropertyResolver("fileType32", this.resolverFileType32);
       node.addPropertyResolver("size", this.resolverSize);
-      node.addPropertyResolver("editLinkType", this.resolverEditLinkType);
       node.addPropertyResolver("webdavUrl", this.resolverWebdavUrl);
       node.addPropertyResolver("cifsPath", this.resolverCifsPath);
    }
@@ -770,37 +769,7 @@ public class BrowseBean implements IContextListener
    
    // ------------------------------------------------------------------------------
    // Property Resolvers
-   
-   /*public NodePropertyResolver resolverlocked = new NodePropertyResolver() {
-      public Object get(Node node) {
-         return node.isLocked();
-      }
-   };*/
-   
-   /*public NodePropertyResolver resolverOwner = new NodePropertyResolver() {
-      public Object get(Node node) {
-         return getDocument().isWorkingCopyOwner();
-      }
-   };*/
-   
-   /*public NodePropertyResolver resolverCancelCheckOut = new NodePropertyResolver() {
-      public Object get(Node node) {
-         return node.hasAspect(ContentModel.ASPECT_WORKING_COPY) && node.hasPermission(PermissionService.CANCEL_CHECK_OUT);
-      }
-   };*/
-   
-   /*public NodePropertyResolver resolverCheckIn = new NodePropertyResolver() {
-      public Object get(Node node) {
-         return node.hasAspect(ContentModel.ASPECT_WORKING_COPY) && node.hasPermission(PermissionService.CHECK_IN);
-      }
-   };*/
-   
-   /*public NodePropertyResolver resolverWorkingCopy = new NodePropertyResolver() {
-      public Object get(Node node) {
-         return node.hasAspect(ContentModel.ASPECT_WORKING_COPY);
-      }
-   
-   };*/
+
    public NodePropertyResolver resolverDownload = new NodePropertyResolver() {
       public Object get(Node node) {
          return DownloadContentServlet.generateDownloadURL(node.getNodeRef(), node.getName());
@@ -880,23 +849,6 @@ public class BrowseBean implements IContextListener
       }
    };
    
-   public NodePropertyResolver resolverEditLinkType = new NodePropertyResolver() {
-      public Object get(Node node)
-      {
-         String editLinkType = "http";
-         
-         // if the node is inline editable, the default http behaviour should 
-         // always be used otherwise the configured approach is used
-         if (node.hasAspect(ContentModel.ASPECT_INLINEEDITABLE) == false)
-         {
-            editLinkType = Application.getClientConfig(
-                  FacesContext.getCurrentInstance()).getEditLinkType();
-         }
-         
-         return editLinkType;
-      }
-   };
-   
    
    // ------------------------------------------------------------------------------
    // Navigation action event handlers
diff --git a/source/java/org/alfresco/web/bean/repository/QNameNodeMap.java b/source/java/org/alfresco/web/bean/repository/QNameNodeMap.java
index f1023ad8b9..92c0ecdc18 100644
--- a/source/java/org/alfresco/web/bean/repository/QNameNodeMap.java
+++ b/source/java/org/alfresco/web/bean/repository/QNameNodeMap.java
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory;
 public final class QNameNodeMap<K,V> extends QNameMap implements Map, Cloneable
 {
    private Node parent = null;
-   private Map<String, NodePropertyResolver> resolvers = new HashMap<String, NodePropertyResolver>(16, 1.0f);
+   private Map<String, NodePropertyResolver> resolvers = new HashMap<String, NodePropertyResolver>(8, 1.0f);
    
    /**
     * Constructor