diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
index c46a933d80..77920ae8c1 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
@@ -171,6 +171,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
                     
                     CommonFilesSearchNode commonFilesNode = new CommonFilesSearchNode(metadata);
                                         
+                    //TODO consider getting em from ExplorerManager.find(this) rather the this wonky stuff seen here...
                     DataResultFilterNode dataResultFilterNode = new DataResultFilterNode(commonFilesNode, DirectoryTreeTopComponent.getDefault().getExplorerManager());
                     
                     TableFilterNode tableFilterWithDescendantsNode = new TableFilterNode(dataResultFilterNode);
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
index 8aaecdc732..2f8a3eae57 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
@@ -343,10 +343,6 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
         if (this.rootNode != null) {
             rootNodeListener.reset();
             this.rootNode.addNodeListener(rootNodeListener);
-            //while (this.rootNode.getChildren().nodes().hasMoreElements()) {
-            //    this.rootNode.getChildren().nodes().nextElement().addNodeListener(rootNodeListener);
-           //     
-           // }
         }
 
         resetTabs(this.rootNode);
@@ -627,13 +623,6 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
                 waitingForData = false;
                 Node childNode = nme.getNode();
                 new SetupTabsChildrenWorker(childNode).execute();
-//                if (SwingUtilities.isEventDispatchThread()) {
-//                    setupTabs(nme.getNode());
-//                } else {
-//                    SwingUtilities.invokeLater(() -> {
-//                        setupTabs(nme.getNode());
-//                    });
-//                }
             }
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index 54e2edf995..1cfad69a70 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -84,7 +84,6 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
     @NbBundle.Messages("DataResultViewerTable.firstColLbl=Name")
     static private final String FIRST_COLUMN_LABEL = Bundle.DataResultViewerTable_firstColLbl();
     private static final Color TAGGED_COLOR = new Color(255, 255, 195);
-    private Node selectedChild;
     private final String title;
 
     /**
@@ -329,7 +328,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
                             break;
                         }
                     }
-                    ((TableFilterNode) currentRoot).setChildNodeSelectionInfo(new ContentNodeSelectionInfo(currentRoot.getLookup().lookup(AbstractFile.class)));
+                    ((TableFilterNode) currentRoot).setChildNodeSelectionInfo(null);
                 }
             }
         });