diff --git a/config/alfresco/avm-services-context.xml b/config/alfresco/avm-services-context.xml
index 754d221cb9..be69a1611c 100644
--- a/config/alfresco/avm-services-context.xml
+++ b/config/alfresco/avm-services-context.xml
@@ -102,9 +102,6 @@
 	    <property name="purgeVersionTxnListener">
 		    <ref bean="purgeVersionTxnListener"/>
 		</property>
-		<property name="qnameDAO">
-		    <ref bean="qnameDAO"/>
-		</property>
 		<property name="avmStoreDAO">
 		    <ref bean="avmStoreDAO"/>
 		</property>
@@ -123,9 +120,6 @@
 		<property name="childEntryDAO">
 		    <ref bean="childEntryDAO"/>
 		</property>
-		<property name="dictionaryService">
-		    <ref bean="dictionaryService"/>
-		</property>
 	</bean>
 
 	<!-- A Local implementation of the Remote AVM interface. -->
diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java
index 95be647d23..22364fff11 100644
--- a/source/java/org/alfresco/repo/avm/AVMRepository.java
+++ b/source/java/org/alfresco/repo/avm/AVMRepository.java
@@ -35,7 +35,6 @@ import org.alfresco.repo.content.ContentStore;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.domain.avm.AVMStoreEntity;
 import org.alfresco.repo.domain.permissions.Acl;
-import org.alfresco.repo.domain.qname.QNameDAO;
 import org.alfresco.repo.security.permissions.ACLCopyMode;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
@@ -49,7 +48,6 @@ import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avm.AVMWrongTypeException;
 import org.alfresco.service.cmr.avm.LayeringDescriptor;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
-import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
@@ -95,8 +93,6 @@ public class AVMRepository
      */
     private LookupCache fLookupCache;
 
-    private QNameDAO qnameDAO;
-
     private AVMStoreDAO fAVMStoreDAO;
 
     private AVMNodeDAO fAVMNodeDAO;
@@ -111,8 +107,6 @@ public class AVMRepository
 
     private PermissionService fPermissionService;
 
-    private DictionaryService fDictionaryService;
-
     // A bunch of TransactionListeners that do work for this.
 
     /**
@@ -183,11 +177,6 @@ public class AVMRepository
         fPurgeVersionTxnListener = listener;
     }
 
-    public void setQnameDAO(QNameDAO qnameDAO)
-    {
-        this.qnameDAO = qnameDAO;
-    }
-
     public void setAvmStoreDAO(AVMStoreDAO dao)
     {
         fAVMStoreDAO = dao;
@@ -223,11 +212,6 @@ public class AVMRepository
         fPermissionService = service;
     }
 
-    public void setDictionaryService(DictionaryService service)
-    {
-        fDictionaryService = service;
-    }
-
     /**
      * Create a file.
      * 
diff --git a/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java b/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
index 8286a17e42..929fc96dea 100644
--- a/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
+++ b/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
@@ -269,22 +269,6 @@ class AVMNodeDAOIbatis implements AVMNodeDAO
         return nodes;
     }
     
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.AVMNodeDAO#flush()
-     */
-    public void flush()
-    {
-        // NOOP
-    }
-    
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.AVMNodeDAO#evict(org.alfresco.repo.avm.AVMNode)
-     */
-    public void evict(AVMNode node)
-    {
-        // NOOP
-    }
-    
     /* (non-Javadoc)
      * @see org.alfresco.repo.avm.AVMNodeDAO#clear()
      */
@@ -293,22 +277,6 @@ class AVMNodeDAOIbatis implements AVMNodeDAO
         AVMDAOs.Instance().newAVMNodeDAO.clearNodeEntityCache();
     }
     
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.AVMNodeDAO#noCache()
-     */
-    public void noCache()
-    {
-        // NOOP
-    }
-    
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.AVMNodeDAO#yesCache()
-     */
-    public void yesCache()
-    {
-        // NOOP
-    }
-    
     /* (non-Javadoc)
      * @see org.alfresco.repo.avm.AVMNodeDAO#clearNewInStore(org.alfresco.repo.avm.AVMStore)
      */
diff --git a/source/java/org/alfresco/repo/avm/ibatis/VersionRootDAOIbatis.java b/source/java/org/alfresco/repo/avm/ibatis/VersionRootDAOIbatis.java
index 482ba3b6ba..3abcde681d 100644
--- a/source/java/org/alfresco/repo/avm/ibatis/VersionRootDAOIbatis.java
+++ b/source/java/org/alfresco/repo/avm/ibatis/VersionRootDAOIbatis.java
@@ -25,7 +25,6 @@ import java.util.List;
 import org.alfresco.repo.avm.AVMDAOs;
 import org.alfresco.repo.avm.AVMNode;
 import org.alfresco.repo.avm.AVMStore;
-import org.alfresco.repo.avm.AVMStoreImpl;
 import org.alfresco.repo.avm.DirectoryNode;
 import org.alfresco.repo.avm.VersionRoot;
 import org.alfresco.repo.avm.VersionRootDAO;