diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
index aa93890ff7..497fa70c3a 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
@@ -107,17 +107,16 @@ public final class ImageGalleryController {
     private final HashSetManager hashSetManager;
     private final CategoryManager categoryManager;
     private final DrawableTagsManager tagsManager;
-    private final ReadOnlyLongWrapper filterByDataSourceId = new ReadOnlyLongWrapper(0);
 
     private ListeningExecutorService dbExecutor;
 
     private final Case autopsyCase;
+    private final SleuthkitCase sleuthKitCase;
+    private final DrawableDB drawableDB;
 
     public Case getAutopsyCase() {
         return autopsyCase;
     }
-    private final SleuthkitCase sleuthKitCase;
-    private final DrawableDB drawableDB;
 
     public ReadOnlyBooleanProperty metaDataCollapsedProperty() {
         return metaDataCollapsed.getReadOnlyProperty();
@@ -423,6 +422,7 @@ public final class ImageGalleryController {
 
     public ThumbnailCache getThumbsCache() {
         return thumbnailCache;
+
     }
 
     /**
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
index 5a942132db..07baaf72a9 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
@@ -27,7 +27,6 @@ import javafx.application.Platform;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
index 8d287c7881..5168e25630 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
@@ -65,15 +65,6 @@ public class CategoryManager {
      */
     private final DrawableDB drawableDb;
 
-    public CategoryManager(ImageGalleryController controller) {
-        this.controller = controller;
-        this.drawableDb = controller.getDatabase();
-    }
-
-    private ImageGalleryController getController() {
-        return controller;
-    }
-
     /**
      * Used to distribute CategoryChangeEvents
      */
@@ -102,6 +93,15 @@ public class CategoryManager {
                 }
             });
 
+    public CategoryManager(ImageGalleryController controller) {
+        this.controller = controller;
+        this.drawableDb = controller.getDatabase();
+    }
+
+    private ImageGalleryController getController() {
+        return controller;
+    }
+
     synchronized public void invalidateCaches() {
         categoryCounts.invalidateAll();
         catTagNameMap.invalidateAll();