diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLITool.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLITool.java
index 3e303defd5..e055310fe8 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLITool.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLITool.java
@@ -20,7 +20,6 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
-import org.dspace.search.DSIndexer;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -54,7 +53,6 @@ public class ItemImportCLITool {
 
     public static void main(String[] argv) throws Exception
     {
-        DSIndexer.setBatchProcessingMode(true);
         Date startTime = new Date();
         int status = 0;
 
@@ -408,7 +406,6 @@ public class ItemImportCLITool {
                 System.out.println("***End of Test Run***");
             }
         } finally {
-            DSIndexer.setBatchProcessingMode(false);
             Date endTime = new Date();
             System.out.println("Started: " + startTime.getTime());
             System.out.println("Ended: " + endTime.getTime());
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
index f75741c022..9de151a44f 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
@@ -164,7 +164,7 @@ public class IndexEventConsumer implements Consumer {
             // update the changed Items not deleted because they were on create list
             for (DSpaceObject iu : objectsToUpdate) {
                 /* we let all types through here and 
-                 * allow the search DSIndexer to make 
+                 * allow the search indexer to make 
                  * decisions on indexing and/or removal
                  */
                 String hdl = iu.getHandle();