diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.css b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.css
deleted file mode 100644
index 937a27b23e..0000000000
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.list-cell:odd {
- -fx-background-color: transparent; /* derive(-fx-control-inner-background,-5%); */
-}
-.list-cell:even {
- -fx-background-color: transparent; /* derive(-fx-control-inner-background,-5%); */
-}
\ No newline at end of file
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.fxml b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.fxml
deleted file mode 100644
index b9e198f274..0000000000
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.fxml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.java b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.java
deleted file mode 100644
index d2294c700d..0000000000
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FilterPane.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2013 Basis Technology Corp.
- * Contact: carrier sleuthkit org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.imageanalyzer.filtering;
-
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.FilterRow;
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.AtomicFilter;
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.UnionFilter;
-import org.sleuthkit.autopsy.imageanalyzer.FXMLConstructor;
-import java.net.URL;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.TreeMap;
-import javafx.collections.ListChangeListener;
-import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.TitledPane;
-import javafx.scene.layout.VBox;
-
-/**
- * FXML Controller class
- *
- */
-public class FilterPane extends TitledPane {
-
- @FXML
- private ResourceBundle resources;
- @FXML
- private URL location;
- @FXML
- private VBox filtersBox;
- @FXML
- private CheckBox selectedBox;
- private UnionFilter filter;
- private Map filterRowMap = new TreeMap<>(AtomicFilter.ALPHABETIC_COMPARATOR);
-
- @FXML
- void initialize() {
- assert filtersBox != null : "fx:id=\"filtersBox\" was not injected: check your FXML file 'FilterPane.fxml'.";
- assert selectedBox != null : "fx:id=\"selectedBox\" was not injected: check your FXML file 'FilterPane.fxml'.";
- }
-
- public FilterPane() {
- FXMLConstructor.construct(this, "FilterPane.fxml");
- }
-
- private void rebuildChildren() {
- filtersBox.getChildren().clear();
- for (FilterRow af : filterRowMap.values()) {
- filtersBox.getChildren().add(af);
- }
- }
-
- void setFilter(UnionFilter filter) {
-//TODO : do this more reasonably
- this.filter = filter;
- this.setText(filter.getDisplayName());
- filterRowMap.clear();
- filtersBox.getChildren().clear();
- for (AtomicFilter af : filter.subFilters) {
- final FilterRow filterRow = af.getUI();
- filterRowMap.put(af, filterRow);
- }
- rebuildChildren();
-
- this.filter.subFilters.addListener(new ListChangeListener() {
- @Override
- public void onChanged(ListChangeListener.Change extends AtomicFilter> change) {
- while (change.next()) {
- for (AtomicFilter af : change.getAddedSubList()) {
- FilterRow filterRow = af.getUI();
- filterRowMap.put(af, filterRow);
- }
- for (AtomicFilter af : change.getRemoved()) {
- filterRowMap.remove(af);
- }
- }
- rebuildChildren();
- }
- });
-
- this.filter.active.bindBidirectional(selectedBox.selectedProperty());
- }
-}
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FiltersPanel.fxml b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FiltersPanel.fxml
deleted file mode 100644
index 41636f42d7..0000000000
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FiltersPanel.fxml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FiltersPanel.java b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FiltersPanel.java
deleted file mode 100644
index b5b7acb7c9..0000000000
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/filtering/FiltersPanel.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2013 Basis Technology Corp.
- * Contact: carrier sleuthkit org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.imageanalyzer.filtering;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.logging.Level;
-import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Service;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.layout.AnchorPane;
-import javax.swing.SortOrder;
-import org.sleuthkit.autopsy.coreutils.LoggedTask;
-import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.imageanalyzer.FXMLConstructor;
-import org.sleuthkit.autopsy.imageanalyzer.FileUpdateEvent;
-import org.sleuthkit.autopsy.imageanalyzer.FileUpdateListener;
-import org.sleuthkit.autopsy.imageanalyzer.ImageAnalyzerController;
-import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableAttribute;
-import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableDB;
-import org.sleuthkit.autopsy.imageanalyzer.datamodel.DrawableFile;
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.AbstractFilter;
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.AtomicFilter;
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.AttributeFilter;
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.FilterSet;
-import org.sleuthkit.autopsy.imageanalyzer.filtering.filters.NameFilter;
-import org.sleuthkit.autopsy.imageanalyzer.grouping.GroupSortBy;
-
-/**
- * This singleton acts as the controller for the Filters. It creates filters
- * based on values in the database, and broadcasts events when the activation
- * state or other ui configuration of the filters changes.
- *
- * deprecated until we revisit filtering
- */
-@Deprecated
-public class FiltersPanel extends AnchorPane implements FileUpdateListener {
-
- public static final String FILTER_STATE_CHANGED = "FILTER_STATE_CHANGED";
- @FXML
- private ResourceBundle resources;
- @FXML
- private URL location;
- @FXML
- private ListView< AttributeFilter> filtersList;
- private static final Logger LOGGER = Logger.getLogger(FiltersPanel.class.getName());
- volatile private DrawableDB db;
- final Map attrFilterMap = new HashMap<>();
- private static FiltersPanel instance;
-
- /**
- * clear/reset state
- */
- public void clear() {
- Platform.runLater(() -> {
- db = null;
- filterSet.clear();
- attrFilterMap.clear();
- });
- }
-
- private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
- /**
- * listen to changes in individual filters and forward to external listeners
- * via the pcs
- */
- private final ChangeListener filterForwardingListener = (ChangeListener