diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
index 0fb31cd788..56b8501c26 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
@@ -81,9 +81,7 @@ import org.sleuthkit.autopsy.timeline.events.ViewInTimelineRequestedEvent;
 import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
 import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DefaultFilterState;
 import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilterState;
-import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterState;
 import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterState;
-import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.UIFilter;
 import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
 import org.sleuthkit.autopsy.timeline.zooming.TimeUnits;
 import org.sleuthkit.autopsy.timeline.zooming.ZoomState;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
index 7c828ea80b..3208d22600 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
@@ -60,7 +60,6 @@ import org.sleuthkit.autopsy.timeline.ui.AbstractTimelineChart;
 import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
 import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailsViewModel;
 import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.EventStripe;
-import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.UIFilter;
 import org.sleuthkit.autopsy.timeline.utils.MappedList;
 import org.sleuthkit.autopsy.timeline.zooming.ZoomState;
 import org.sleuthkit.datamodel.DescriptionLoD;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/HideDescriptionAction.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/HideDescriptionAction.java
index 71994ae502..d54eab633a 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/HideDescriptionAction.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/HideDescriptionAction.java
@@ -24,8 +24,6 @@ import org.controlsfx.control.action.Action;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilter;
 import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilterState;
-import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterState;
-import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.UIFilter;
 import org.sleuthkit.datamodel.DescriptionLoD;
 
 /**
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/DescriptionFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/DescriptionFilterState.java
index 28404c087b..1d44be3dc2 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/DescriptionFilterState.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/DescriptionFilterState.java
@@ -1,7 +1,20 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2018 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> 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.timeline.ui.filtering.datamodel;
 
@@ -13,70 +26,80 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
 /**
- *
- *
+ * A FilterState implementation for DescriptionFilters
  */
 public class DescriptionFilterState implements FilterState<DescriptionFilter> {
-    
+
     private final DescriptionFilter filter;
-    
+
     public DescriptionFilterState(DescriptionFilter filter) {
         this(filter, false);
     }
-    
+
     public DescriptionFilterState(DescriptionFilter filter, boolean selected) {
         this.filter = filter;
         this.selected.set(selected);
     }
-    
+
     private final SimpleBooleanProperty selected = new SimpleBooleanProperty(false);
     private final SimpleBooleanProperty disabled = new SimpleBooleanProperty(false);
     private final BooleanBinding activeProp = Bindings.and(selected, disabled.not());
-    
+
+    @Override
     public BooleanProperty selectedProperty() {
         return selected;
     }
-    
+
+    @Override
     public BooleanProperty disabledProperty() {
         return disabled;
     }
-    
+
+    @Override
     public void setSelected(Boolean act) {
         selected.set(act);
     }
-    
+
+    @Override
     public boolean isSelected() {
         return selected.get();
     }
-    
+
+    @Override
     public void setDisabled(Boolean act) {
         disabled.set(act);
     }
-    
+
+    @Override
     public boolean isDisabled() {
         return disabledProperty().get();
     }
-    
+
+    @Override
     public boolean isActive() {
         return activeProperty().get();
     }
-    
+
+    @Override
     public BooleanExpression activeProperty() {
         return activeProp;
     }
-    
+
+    @Override
     public String getDisplayName() {
         return filter.getDescription();
     }
-    
+
+    @Override
     public DescriptionFilter getFilter() {
         return filter;
     }
-    
+
+    @Override
     public DescriptionFilter getActiveFilter() {
         return isActive() ? getFilter() : null;
     }
-    
+
     @Override
     public int hashCode() {
         int hash = 7;
@@ -85,7 +108,7 @@ public class DescriptionFilterState implements FilterState<DescriptionFilter> {
         hash = 37 * hash + Objects.hashCode(this.disabled);
         return hash;
     }
-    
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -109,7 +132,7 @@ public class DescriptionFilterState implements FilterState<DescriptionFilter> {
         }
         return true;
     }
-    
+
     @Override
     public DescriptionFilterState copyOf() {
         DescriptionFilterState copy = new DescriptionFilterState(filter);
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/FilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/FilterState.java
index bfe5e9630e..be4da26801 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/FilterState.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/FilterState.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel;
 
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.ReadOnlyBooleanProperty;
-import org.sleuthkit.datamodel.timeline.TimelineFilter;
 
 /**
  * The state of a filter: selected, disabled, active, etc.
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
index 73d356b67f..ad21f83827 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/RootFilterState.java
@@ -19,7 +19,6 @@
 package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel;
 
 import com.google.common.collect.Lists;
-import java.util.function.Predicate;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.collections.FXCollections;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/UIFilter.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/UIFilter.java
index 9ef81e1520..7df3568a45 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/UIFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/UIFilter.java
@@ -22,7 +22,7 @@ import java.util.function.Predicate;
 import org.sleuthkit.datamodel.timeline.TimelineEvent;
 
 /**
- *
+ * A Filter over TimelineEvents that is applied in the UI, not the DB. *
  */
 public interface UIFilter extends Predicate<TimelineEvent> {