diff --git a/source/java/org/alfresco/encryption/KeyStoreTests.java b/source/java/org/alfresco/encryption/KeyStoreTests.java
index 760e58a313..cb4add62ca 100644
--- a/source/java/org/alfresco/encryption/KeyStoreTests.java
+++ b/source/java/org/alfresco/encryption/KeyStoreTests.java
@@ -18,7 +18,6 @@
  */
 package org.alfresco.encryption;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
diff --git a/source/java/org/alfresco/encryption/ReEncryptor.java b/source/java/org/alfresco/encryption/ReEncryptor.java
index 7f5f9177d5..68c1e2ae53 100644
--- a/source/java/org/alfresco/encryption/ReEncryptor.java
+++ b/source/java/org/alfresco/encryption/ReEncryptor.java
@@ -50,7 +50,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Re-encrypts encryptable repository properties using a new set of encryption keys.
@@ -95,7 +94,6 @@ public class ReEncryptor implements ApplicationContextAware
     {
     	this.transactionService = transactionService;
         this.transactionHelper = transactionService.getRetryingTransactionHelper();
-        this.transactionHelper.setForceWritable(true);
     }
     
 	public void setMetadataEncryptor(MetadataEncryptor metadataEncryptor)
diff --git a/source/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java b/source/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java
index 32402f1a40..6d626b5170 100644
--- a/source/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java
+++ b/source/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java
@@ -41,16 +41,12 @@ import java.util.Map;
 public class AnalysedDirectory
 {
     private List<File> originalListing = null;
-    // All importable items (files and directories)
-//    private List<ImportableItem> importableItems = null;
     private Map<File, ImportableItem> importableItems = null;
-    // keep track of directories in this list as well as importedItems
     private List<ImportableItem> importableDirectories = null;
 
     public AnalysedDirectory(File[] files)
     {
         originalListing = Arrays.asList(files);
-//        importableItems = new ArrayList<ImportableItem>();
         importableItems = new HashMap<File, ImportableItem>();
         importableDirectories = new ArrayList<ImportableItem>();    	
     }
@@ -59,11 +55,6 @@ public class AnalysedDirectory
 	{
 		return originalListing;
 	}
-
-//	public List<ImportableItem> getImportableItems()
-//	{
-//		return importableItems;
-//	}
     
 	public Collection<ImportableItem> getImportableItems()
 	{
@@ -77,7 +68,6 @@ public class AnalysedDirectory
 
 	public void addImportableItem(ImportableItem importableItem)
     {
-//    	importableItems.add(importableItem);
         if(importableItem.getHeadRevision().contentFileExists() &&
         		ImportableItem.FileType.DIRECTORY.equals(importableItem.getHeadRevision().getContentFileType()))
         {
@@ -92,18 +82,7 @@ public class AnalysedDirectory
     public ImportableItem findImportableItem(File contentFile)
     {
     	ImportableItem result = null;
-
-    	// TODO perhaps a map structure here to make lookups faster?
-//        for (ImportableItem importableItem : importableItems)
-//        {
-//            if (contentFile.equals(importableItem.getHeadRevision().getContentFile()))
-//            {
-//                result = importableItem;
-//                break;
-//            }
-//        }
     	result = importableItems.get(contentFile);
-
         return result;
     }
 }