diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 7dec8e49fb..152ed84eea 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -5,4 +5,4 @@ nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
 spec.version.base=1.0
-javahelp.hs=casemodule-helpset.xml
+
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/casemodule-helpset.xml b/Core/src/org/sleuthkit/autopsy/casemodule/casemodule-helpset.xml
deleted file mode 100644
index cf939eae2e..0000000000
--- a/Core/src/org/sleuthkit/autopsy/casemodule/casemodule-helpset.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE helpsetref PUBLIC "-//NetBeans//DTD JavaHelp Help Set Reference 1.0//EN" "http://www.netbeans.org/dtds/helpsetref-1_0.dtd">
-<helpsetref url="nbdocs:/org/sleuthkit/autopsy/casemodule/docs/casemodule-hs.xml"/>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/layer.xml.old b/Core/src/org/sleuthkit/autopsy/casemodule/layer.xml.old
deleted file mode 100644
index e3af281221..0000000000
--- a/Core/src/org/sleuthkit/autopsy/casemodule/layer.xml.old
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <attr name="Toolbars\File\org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance\iconBase" stringvalue="org/sleuthkit/autopsy/images/close-icon.gif"/>
-    <folder name="Actions">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-casemodule-AddImageAction.instance">
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance">
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseNewAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseNewAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_CaseNewAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <!--<file name="org-sleuthkit-autopsy-casemodule-CaseOpenActionOld.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseOpenActionOld"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_CaseOpenActionOld"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>-->
-            <file name="org-sleuthkit-autopsy-casemodule-CasePropertiesAction.instance">
-            </file>
-            <!--<file name="org-sleuthkit-autopsy-casemodule-NewCaseAct.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.NewCaseAct"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_NewCaseAct"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-NewCaseAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.NewCaseAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_NewCaseAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>-->
-            <file name="org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseOpenAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_OpenAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseSaveAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseSaveAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_SaveCaseAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-RecentCases.instance">
-            </file>
-        </folder>
-        <folder name="Tools">
-            <!--<file name="org-sleuthkit-autopsy-filebrowser-FileBrowserAction.instance"></file>-->
-        </folder>
-        <folder name="View">
-            <file name="org-netbeans-core-windows-actions-ToolbarsListAction.instance">
-            </file>
-        </folder>
-        <folder name="Window">
-            <file name="org-sleuthkit-autopsy-casemodule-testAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.casemodule.testTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_testAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-            <!--<file name="org-sleuthkit-autopsy-filebrowser-FileBrowserAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.filebrowser.FileBrowserTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.filebrowser.Bundle#CTL_FileBrowserAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-filebrowser-ChangeViewAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.filebrowser.ChangeViewAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.filebrowser.Bundle#CTL_ChangeViewAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-filebrowser-DetailWindowAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.filebrowser.DetailWindowTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.filebrowser.Bundle#CTL_DetailWindowAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>-->
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-casemodule-CaseNewAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseNewAction.instance"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseOpenAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance"/>
-                <attr name="position" intvalue="101"/>
-            </file>
-            <folder name="Open Recent Case">
-                <attr name="position" intvalue="102"/>
-                <file name="org-sleuthkit-autopsy-casemodule-RecentCasesAction.shadow">
-                    <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-RecentCases.instance"/>
-                </file>
-            </folder>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAct.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance"/>
-                <attr name="position" intvalue="103"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImage-separatorBefore.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="200"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImageAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-AddImageAction.instance"/>
-                <attr name="position" intvalue="201"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImage-separatorAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="202"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CasePropertiesAction-separatorBefore.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="300"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CasePropertiesAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CasePropertiesAction.instance"/>
-                <attr name="position" intvalue="301"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="casemodule-helpset.xml" url="casemodule-helpset.xml">
-                <attr name="position" intvalue="3075"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Shortcuts">
-        <file name="D-N.shadow">
-            <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseNewAction.instance"/>
-        </file>
-        <file name="D-O.shadow">
-            <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance"/>
-        </file>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseCloseAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_CaseCloseAct"/>
-                <attr name="iconBase" stringvalue="org/sleuthkit/autopsy/images/close-icon.png"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImageAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.AddImageAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_AddImage"/>
-                <attr name="iconBase" stringvalue="org/sleuthkit/autopsy/images/addImage-icon.png"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-                <attr name="position" intvalue="101"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseSaveAction.instance_hidden"/>
-        </folder>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components"/>
-        <folder name="Modes">
-            <folder name="editor"/>
-            <folder name="output"/>
-        </folder>
-    </folder>
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer - case.xml b/Core/src/org/sleuthkit/autopsy/core/layer - case.xml
deleted file mode 100644
index e3af281221..0000000000
--- a/Core/src/org/sleuthkit/autopsy/core/layer - case.xml	
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <attr name="Toolbars\File\org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance\iconBase" stringvalue="org/sleuthkit/autopsy/images/close-icon.gif"/>
-    <folder name="Actions">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-casemodule-AddImageAction.instance">
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance">
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseNewAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseNewAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_CaseNewAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <!--<file name="org-sleuthkit-autopsy-casemodule-CaseOpenActionOld.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseOpenActionOld"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_CaseOpenActionOld"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>-->
-            <file name="org-sleuthkit-autopsy-casemodule-CasePropertiesAction.instance">
-            </file>
-            <!--<file name="org-sleuthkit-autopsy-casemodule-NewCaseAct.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.NewCaseAct"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_NewCaseAct"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-NewCaseAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.NewCaseAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_NewCaseAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>-->
-            <file name="org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseOpenAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_OpenAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseSaveAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseSaveAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_SaveCaseAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-RecentCases.instance">
-            </file>
-        </folder>
-        <folder name="Tools">
-            <!--<file name="org-sleuthkit-autopsy-filebrowser-FileBrowserAction.instance"></file>-->
-        </folder>
-        <folder name="View">
-            <file name="org-netbeans-core-windows-actions-ToolbarsListAction.instance">
-            </file>
-        </folder>
-        <folder name="Window">
-            <file name="org-sleuthkit-autopsy-casemodule-testAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.casemodule.testTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_testAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-            <!--<file name="org-sleuthkit-autopsy-filebrowser-FileBrowserAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.filebrowser.FileBrowserTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.filebrowser.Bundle#CTL_FileBrowserAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-filebrowser-ChangeViewAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.filebrowser.ChangeViewAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.filebrowser.Bundle#CTL_ChangeViewAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-filebrowser-DetailWindowAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.filebrowser.DetailWindowTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.filebrowser.Bundle#CTL_DetailWindowAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>-->
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-casemodule-CaseNewAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseNewAction.instance"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseOpenAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance"/>
-                <attr name="position" intvalue="101"/>
-            </file>
-            <folder name="Open Recent Case">
-                <attr name="position" intvalue="102"/>
-                <file name="org-sleuthkit-autopsy-casemodule-RecentCasesAction.shadow">
-                    <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-RecentCases.instance"/>
-                </file>
-            </folder>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAct.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance"/>
-                <attr name="position" intvalue="103"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImage-separatorBefore.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="200"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImageAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-AddImageAction.instance"/>
-                <attr name="position" intvalue="201"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImage-separatorAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="202"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CasePropertiesAction-separatorBefore.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="300"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CasePropertiesAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CasePropertiesAction.instance"/>
-                <attr name="position" intvalue="301"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="casemodule-helpset.xml" url="casemodule-helpset.xml">
-                <attr name="position" intvalue="3075"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Shortcuts">
-        <file name="D-N.shadow">
-            <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseNewAction.instance"/>
-        </file>
-        <file name="D-O.shadow">
-            <attr name="originalFile" stringvalue="Actions/File/org-sleuthkit-autopsy-casemodule-CaseOpenAction.instance"/>
-        </file>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.CaseCloseAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_CaseCloseAct"/>
-                <attr name="iconBase" stringvalue="org/sleuthkit/autopsy/images/close-icon.png"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-AddImageAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.AddImageAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.casemodule.Bundle#CTL_AddImage"/>
-                <attr name="iconBase" stringvalue="org/sleuthkit/autopsy/images/addImage-icon.png"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-                <attr name="position" intvalue="101"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-casemodule-CaseSaveAction.instance_hidden"/>
-        </folder>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components"/>
-        <folder name="Modes">
-            <folder name="editor"/>
-            <folder name="output"/>
-        </folder>
-    </folder>
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer-empty.xml b/Core/src/org/sleuthkit/autopsy/core/layer-empty.xml
deleted file mode 100644
index f8c0c0ff39..0000000000
--- a/Core/src/org/sleuthkit/autopsy/core/layer-empty.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-   
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer-old.xml b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer-old.xml
deleted file mode 100644
index 8a00fbd9d9..0000000000
--- a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer-old.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <attr name="Menu\File\org-netbeans-modules-print-action-PageSetupAction.shadow_hidden\position" intvalue="300"/>
-    <attr name="Menu\File\org-netbeans-modules-print-action-PrintAction.shadow_hidden\position" intvalue="500"/>
-    <folder name="OptionsDialog"> 
-        <folder name="General.instance_hidden"/>
-        <folder name="Keymaps.instance_hidden"/> <!-- Keymap -->
-        <folder name="Java.instance_hidden"/>
-        <folder name="Advanced.instance_hidden"/> <!-- Miscellaneous -->
-    </folder>
-    <file name="OptionsExport_hidden"/> <!-- Hide import/export in Options -->
-    <folder name="PluginsDialog">
-        <folder name="RCPPlatform.instance_hidden"/>
-    </folder>
-    
-<!--<attr name="Menu\File\Separator2.instance_hidden\position" intvalue="100"/>
-    <attr name="Menu\File\Separator3.instance_hidden\position" intvalue="200"/>
-    <attr name="Menu\File\Separator4.instance_hidden\position" intvalue="400"/>-->
-    
-    <folder name="Actions">
-        <folder name="Help">
-            <file name="org-netbeans-core-actions-AboutAction.instance_hidden"/>
-        </folder>
-        <folder name="Window">
-            <file name="org-netbeans-core-windows-actions-GlobalPropertiesAction.instance_hidden"/>
-        </folder>
-        <folder name="Toolbars">
-             <folder name="QuickSearch_hidden"/>
-        </folder>
-    </folder>
-    
-    <folder name="Menu">
-        <folder name="File">
-            <file name="org-netbeans-modules-print-action-PageSetupAction.shadow_hidden"/>
-            <file name="org-netbeans-modules-print-action-PrintAction.shadow_hidden"/>
-            <file name="org-openide-actions-SaveAction.shadow_hidden"/>
-            <file name="org-openide-actions-SaveAllAction.shadow_hidden"/>
-            <file name="org-openide-actions-SaveAsAction.shadow_hidden"/>
-            
-        <!--<file name="Separator2.instance_hidden"/>
-            <file name="Separator3.instance_hidden"/>
-            <file name="Separator4.instance_hidden"/>-->
-        </folder>
-        <file name="GoTo_hidden"/>
-        <folder name="Help">
-            <file name="org-netbeans-core-actions-AboutAction.shadow_hidden"/>
-            <file name="org-netbeans-modules-autoupdate-ui-actions-CheckForUpdatesAction.shadow_hidden"/>
-        </folder>
-        <file name="Reports_hidden"/>
-        <folder name="View">
-            <file name="org-netbeans-core-actions-HTMLViewAction.shadow_hidden"/>
-            <file name="org-netbeans-core-actions-LogAction.shadow_hidden"/>
-            <file name="org-netbeans-core-windows-actions-ToolbarsListAction.instance_hidden"/>
-        </folder>
-        <folder name="Window">
-            <file name="org-netbeans-modules-favorites-View.shadow_hidden"/>
-            <file name="CloneDocumentAction.shadow_hidden"/>
-            <file name="CloseAllButThisAction.shadow_hidden"/>
-            <file name="CloseAllDocumentsAction.shadow_hidden"/>
-            <file name="DocumentsAction.shadow_hidden"/>
-            <!--<file name="FileBrowserAction.shadow"/>
-            <file name="FileBrowserAction.shadow_hidden"/>-->
-            <file name="Output_hidden"/>
-            <file name="ProgressListAction.shadow_hidden"/>
-            <file name="SwitchToRecentDocumentAction.shadow_hidden"/>
-            <file name="ViewFavoritesTabAction.shadow_hidden"/>
-            <file name="org-netbeans-core-windows-actions-ResetWindowsAction.shadow_hidden"/>
-            <file name="testAction.shadow_hidden"/>
-        </folder>
-        <folder name="Tools">
-            <file name="org-netbeans-modules-autoupdate-ui-actions-PluginManagerAction.shadow"/>
-            <file name="org-netbeans-modules-favorites-templates-TemplatesAction.shadow_hidden"/>
-            <file name="org-netbeans-modules-options-OptionsWindowAction.shadow"/>
-            <file name="org-openide-actions-ToolsAction.shadow_hidden"/>
-            
-        <!--<file name="Separator1.instance_hidden"/>
-            <file name="Separator3.instance_hidden"/>-->
-        </folder>
-    </folder>
-    
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-openide-actions-SaveAllAction.shadow_hidden"/>
-        </folder>
-        <file name="UndoRedo_hidden"/>
-    </folder>
-</filesystem>
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/corecomponents-helpset.xml b/Core/src/org/sleuthkit/autopsy/corecomponents/corecomponents-helpset.xml
deleted file mode 100644
index 367403b593..0000000000
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/corecomponents-helpset.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE helpsetref PUBLIC "-//NetBeans//DTD JavaHelp Help Set Reference 1.0//EN" "http://www.netbeans.org/dtds/helpsetref-1_0.dtd">
-<helpsetref url="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-hs.xml"/>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/layer-old.xml b/Core/src/org/sleuthkit/autopsy/corecomponents/layer-old.xml
deleted file mode 100644
index 69f813b15e..0000000000
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/layer-old.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Help">
-            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.corecomponents.CustomAboutAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_CustomAboutAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-        </folder>
-        <folder name="Window">
-            <file name="org-sleuthkit-autopsy-corecomponents-DataContentAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.corecomponents.DataContentTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_DataContentAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Help">
-            <attr name="master-help.xml/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow" boolvalue="true"/>
-            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Help/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance"/>
-                <attr name="position" intvalue="3000"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="corecomponents-helpset.xml" url="corecomponents-helpset.xml">
-                <attr name="position" intvalue="3801"/>
-            </file>
-        </folder>
-        <file name="org-sleuthkit-autopsy-corecomponents-DataContentTopComponent.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.DataContent"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.corecomponents.DataContentTopComponent.getDefault"/>
-        </file>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-        </folder>
-        <folder name="Modes">
-            <folder name="editor">
-                </folder>
-            <folder name="output">
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/layer-old.xml b/Core/src/org/sleuthkit/autopsy/coreutils/layer-old.xml
deleted file mode 100644
index 83b7d8df3b..0000000000
--- a/Core/src/org/sleuthkit/autopsy/coreutils/layer-old.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/directorytree-helpset.xml b/Core/src/org/sleuthkit/autopsy/directorytree/directorytree-helpset.xml
deleted file mode 100644
index 70b8cfd113..0000000000
--- a/Core/src/org/sleuthkit/autopsy/directorytree/directorytree-helpset.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE helpsetref PUBLIC "-//NetBeans//DTD JavaHelp Help Set Reference 1.0//EN" "http://www.netbeans.org/dtds/helpsetref-1_0.dtd">
-<helpsetref url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/directorytree-hs.xml"/>
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/layer-old.xml b/Core/src/org/sleuthkit/autopsy/directorytree/layer-old.xml
deleted file mode 100644
index bbd9430fb8..0000000000
--- a/Core/src/org/sleuthkit/autopsy/directorytree/layer-old.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="directorytree-helpset.xml" url="directorytree-helpset.xml">
-                <attr name="position" intvalue="3086"/>
-            </file>
-        </folder>
-        <file name="org-sleuthkit-autopsy-directorytree-DirectoryTreeTopComponent.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.DataExplorer"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent.getDefault"/>
-            <attr name="position" intvalue="125"/>
-        </file>
-         <file name="org-sleuthkit-autopsy-directorytree-DirectoryTreeTopComponent2.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent.getDefault"/>
-            <attr name="position" intvalue="150"/>
-        </file>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="DirectoryTreeTopComponent.settings" url="DirectoryTreeTopComponentSettings.xml"/>
-        </folder>
-    </folder>
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/layer-old.xml b/Core/src/org/sleuthkit/autopsy/filesearch/layer-old.xml
deleted file mode 100644
index 2e61805b34..0000000000
--- a/Core/src/org/sleuthkit/autopsy/filesearch/layer-old.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.instance">
-            </file>
-        </folder>    
-    </folder>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="filesearch-helpset.xml" url="filesearch-helpset.xml">
-                <attr name="position" intvalue="3662"/>
-            </file>
-        </folder>
-        <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
-            <attr name="position" intvalue="250"/>
-        </file>
-    </folder>
-    <folder name="Menu">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-filesearch-FileSearchAction.instance"/>
-                <attr name="position" intvalue="200"/>
-            </file>
-        </folder>
-    </folder>
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/layer-old.xml b/Core/src/org/sleuthkit/autopsy/ingest/layer-old.xml
deleted file mode 100644
index 8c3dd76810..0000000000
--- a/Core/src/org/sleuthkit/autopsy/ingest/layer-old.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Services">
-        <file name="org-sleuthkit-autopsy-ingest-IngestDialogPanel.instance">
-        <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.casemodule.IngestConfigurator"/>
-        <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.ingest.IngestDialogPanel.getDefault"/>
-        <attr name="position" intvalue="50"/> 
-        </file>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="IngestMessageTopComponent.settings" url="IngestMessageTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="floatingLeftBottom">
-            </folder>
-            <file name="floatingLeftBottom.wsmode" url="floatingLeftBottomWsmode.xml"/>
-        </folder>
-    </folder>
-     <folder name="Actions">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-ingest-IngestMessagesAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.ingest.IngestMessagesAction"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="Ingest">
-            <attr intvalue="103" name="position"/>
-            <file name="org-sleuthkit-autopsy-ingest-IngestMessagesAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-ingest-IngestMessagesAction.instance"/>
-            </file>
-        </folder>
-    </folder>
-
-    
-
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/layer-old.xml b/Core/src/org/sleuthkit/autopsy/menuactions/layer-old.xml
deleted file mode 100644
index b0f1614334..0000000000
--- a/Core/src/org/sleuthkit/autopsy/menuactions/layer-old.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Tools">
-            <!--<file name="org-sleuthkit-autopsy-menuactions-FileBrowserAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.menuactions.FileBrowserAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.menuactions.Bundle#CTL_FileBrowserAction"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>-->
-            <file name="org-sleuthkit-autopsy-menuactions-SpacerAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.menuactions.SpacerAction"/>
-            </file>
-        </folder>
-        <folder name="Window">
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Window">
-            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu-separatoBefore.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="75"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu.instance">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-DataResultMenu.instance"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu-separatoAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="125"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataContentMenu.instance">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-DataContentMenu.instance"/>
-                <attr name="position" intvalue="150"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataContentMenu-separatorAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="175"/>
-            </file>
-       </folder>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-menuactions-SpacerAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-SpacerAction.instance"/>
-                <attr name="position" intvalue="10000"/>
-            </file>
-        </folder>
-    </folder>
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/report/layer-old.xml b/Core/src/org/sleuthkit/autopsy/report/layer-old.xml
deleted file mode 100644
index 3efbb751a0..0000000000
--- a/Core/src/org/sleuthkit/autopsy/report/layer-old.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Menu">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-report-ReportAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportAction.instance"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-report-ReportAction-separatorAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="101"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Services">
-        <file name="org-sleuthkit-autopsy-report-ReportHTML.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportHTML.getDefault"/>
-            <attr name="position" intvalue="900"/>
-        </file>
-        <file name="org-sleuthkit-autopsy-report-ReportXML.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportXML.getDefault"/>
-            <attr name="position" intvalue="901"/>
-        </file>
-        <file name="org-sleuthkit-autopsy-report-ReportXLS.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportXLS.getDefault"/>
-            <attr name="position" intvalue="902"/>
-        </file>
-        <file name="org-sleuthkit-autopsy-report-ReportBodyFile.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportBodyFile.getDefault"/>
-            <attr name="position" intvalue="903"/>
-        </file>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-report-ReportAction.shadow">
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-ReportAction.shadow"/>
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportAction.instance"/>
-                <attr name="position" intvalue="102"/>
-            </file>
-        </folder>
-    </folder>
-   
-</filesystem>