diff --git a/KeywordSearch/release/Solr4to5IndexUpgrade/Solr4IndexUpgrade.jar b/KeywordSearch/release/Solr4to5IndexUpgrade/Solr4IndexUpgrade.jar
index 3447a11a1f..764fc7df8d 100644
Binary files a/KeywordSearch/release/Solr4to5IndexUpgrade/Solr4IndexUpgrade.jar and b/KeywordSearch/release/Solr4to5IndexUpgrade/Solr4IndexUpgrade.jar differ
diff --git a/KeywordSearch/release/Solr5to6IndexUpgrade/Solr5IndexUpgrade.jar b/KeywordSearch/release/Solr5to6IndexUpgrade/Solr5IndexUpgrade.jar
index 6df6a7a95f..9a18d23a98 100644
Binary files a/KeywordSearch/release/Solr5to6IndexUpgrade/Solr5IndexUpgrade.jar and b/KeywordSearch/release/Solr5to6IndexUpgrade/Solr5IndexUpgrade.jar differ
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java
index 2b9c3de8c4..511260669e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java
@@ -18,10 +18,7 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
-import java.net.URL;
 import java.io.File;
-import java.io.IOException;
-import java.net.URLClassLoader;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,14 +29,12 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.io.FileUtils;
 import org.openide.modules.InstalledFileLocator;
-import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponentinterfaces.AutopsyService;
 import org.sleuthkit.autopsy.coreutils.ExecUtil;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.UNCPathUtilities;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProcessTerminator;
 
 /**
  * This class handles the task of finding KWS index folders and upgrading old