diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 989a7c1fe6..cedc80a3ba 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -201,7 +201,7 @@ public class ReportGenerator {
      * @param enabledInfo the Information that should be included about each file
      * in the report.
      */
-    public void generateFileListReports(Map<FILE_REPORT_INFO, Boolean> enabledInfo, Map<String, Boolean> tagSelections) {
+    public void generateFileListReports(Map<FILE_REPORT_INFO, Boolean> enabledInfo) {
         if (!fileProgress.isEmpty() && null != enabledInfo) {
             List<FILE_REPORT_INFO> enabled = new ArrayList<>();
             for (Entry<FILE_REPORT_INFO, Boolean> e : enabledInfo.entrySet()) {
@@ -209,13 +209,7 @@ public class ReportGenerator {
                     enabled.add(e.getKey());
                 }
             }
-            List<String> tagsEnabled = new ArrayList<>();
-            for (Entry<String, Boolean> e : tagSelections.entrySet()) {
-                if(e.getValue()) {
-                    tagsEnabled.add(e.getKey());
-                }
-            }
-            FileReportsWorker worker = new FileReportsWorker(enabled, tagsEnabled);
+            FileReportsWorker worker = new FileReportsWorker(enabled);
             worker.execute();
         }
     }
@@ -244,11 +238,9 @@ public class ReportGenerator {
     private class FileReportsWorker extends SwingWorker<Integer, Integer> {
         private List<FILE_REPORT_INFO> enabledInfo = Arrays.asList(FILE_REPORT_INFO.values());
         private List<FileReportModule> fileModules = new ArrayList<>();
-        private List<String> tags = new ArrayList<>();
         
-        FileReportsWorker(List<FILE_REPORT_INFO> enabled, List<String> tagsEnabled) {
+        FileReportsWorker(List<FILE_REPORT_INFO> enabled) {
             enabledInfo = enabled;
-            tags = tagsEnabled;
             for (Entry<FileReportModule, ReportProgressPanel> entry : fileProgress.entrySet()) {
                 fileModules.add(entry.getKey());
             }
@@ -264,7 +256,7 @@ public class ReportGenerator {
                 }
             }
             
-            List<AbstractFile> files = getFiles(tags);
+            List<AbstractFile> files = getFiles();
             int numFiles = files.size();
             for (FileReportModule module : fileModules) {
                 module.startReport(reportPath);
@@ -318,40 +310,6 @@ public class ReportGenerator {
                 return Collections.EMPTY_LIST;
             }
         }
-        
-        /**
-         * Get Files tagged with the given TagName.
-         * @param tagNames
-         * @return 
-         */
-        private List<AbstractFile> getFiles(List<String> tagNames) {
-            if(tags.isEmpty()) {
-                return getFiles();
-            }
-            List<AbstractFile> absFiles = new ArrayList<>();
-            List<BlackboardArtifact> artifacts = new ArrayList<>();
-            SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
-            for (String tagName : tagNames) {
-                try {
-                    artifacts.addAll(skCase.getBlackboardArtifacts(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TAG_NAME, tagName));
-                } catch (TskCoreException ex) {
-                    return Collections.EMPTY_LIST;
-                }
-            }
-            
-            for (BlackboardArtifact artifact : artifacts) {
-                try {
-                    // TODO: Is this safe to call? Will it always give an AbstractFile?
-                    absFiles.add(skCase.getAbstractFileById(artifact.getObjectID()));
-                } catch (TskCoreException ex) {
-                    return Collections.EMPTY_LIST;
-                }
-            }
-            if(!absFiles.isEmpty()) {
-            System.out.println(absFiles.size());
-            }
-            return absFiles;
-        }
     }
     
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index e4e39d402a..5ee1efde80 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -72,7 +72,7 @@ public final class ReportWizardAction  extends CallableSystemAction implements P
                     (Map<GeneralReportModule, Boolean>)wiz.getProperty("generalModuleStates"),
                     (Map<FileReportModule, Boolean>)wiz.getProperty("fileListModuleStates"));
             generator.generateArtifactTableReports((Map<ARTIFACT_TYPE, Boolean>)wiz.getProperty("artifactStates"), (Map<String, Boolean>)wiz.getProperty("tagStates"));
-            generator.generateFileListReports((Map<FILE_REPORT_INFO, Boolean>)wiz.getProperty("fileReportOptions"), (Map<String, Boolean>)wiz.getProperty("tagStates"));
+            generator.generateFileListReports((Map<FILE_REPORT_INFO, Boolean>)wiz.getProperty("fileReportOptions"));
             generator.generateGeneralReports();
             generator.displayProgressPanels();
         }