diff --git a/Core/ivy.xml b/Core/ivy.xml
index 5763767d74..ffdfe848d7 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -22,37 +22,31 @@
         <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="2.1.4"/>
 
         <dependency conf="core->default" org="org.apache.commons" name="commons-dbcp2" rev="2.1.1"/>
-        <dependency conf="core->default" org="org.apache.commons" name="commons-pool2" rev="2.4.2"/>
-        <dependency conf="core->default" org="commons-codec" name="commons-codec" rev="1.11"/>
 
         <dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.10.3"/>
 
-        <dependency conf="core->default" org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.9.7"/>
-        <dependency org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="2.9.7"/>
+        <dependency conf="core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="2.9.7"/>
 
         <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.11.0"/>
 
         <dependency conf="core->default" org="com.google.cloud" name="google-cloud-translate" rev="1.70.0"/>
-        <dependency conf="core->default" org="org.apache.opennlp" name="opennlp-tools" rev="1.9.1"/>
 
         <dependency conf="core->default" org="com.ethteck.decodetect" name="decodetect-core" rev="0.3"/>
 
         <dependency conf="core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/>
         <dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="3.5" />
-        <dependency conf="core->default" org="commons-validator" name="commons-validator" rev="1.6"/>
-        <dependency conf="core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
 
         <dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/>
         <dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.0.19"/>
 
         <!-- for yaml reading/writing -->
-        <dependency org="org.yaml" name="snakeyaml" rev="1.27"/>
+        <dependency conf="core->default" org="org.yaml" name="snakeyaml" rev="1.27"/>
 
         <!-- map support for geolocation -->
         <dependency conf="core->default" org="org.jxmapviewer" name="jxmapviewer2" rev="2.4"/>
 
         <!-- for handling diffs -->
-        <dependency org="io.github.java-diff-utils" name="java-diff-utils" rev="4.8"/>
+        <dependency conf="core->default" org="io.github.java-diff-utils" name="java-diff-utils" rev="4.8"/>
 
 
         <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 32d56f9b82..852b5bcad1 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -11,19 +11,11 @@ file.reference.bcpkix-jdk15on-1.54.jar=release\\modules\\ext\\bcpkix-jdk15on-1.5
 file.reference.bcprov-ext-jdk15on-1.54.jar=release\\modules\\ext\\bcprov-ext-jdk15on-1.54.jar
 file.reference.bcprov-jdk15on-1.52.jar=release\\modules\\ext\\bcprov-jdk15on-1.52.jar
 file.reference.bcprov-jdk15on-1.54.jar=release\\modules\\ext\\bcprov-jdk15on-1.54.jar
-file.reference.c3p0-0.9.5.jar=release\\modules\\ext\\c3p0-0.9.5.jar
 file.reference.checker-compat-qual-2.5.3.jar=release\\modules\\ext\\checker-compat-qual-2.5.3.jar
-file.reference.commons-beanutils-1.9.2.jar=release\\modules\\ext\\commons-beanutils-1.9.2.jar
-file.reference.commons-codec-1.11.jar=release\\modules\\ext\\commons-codec-1.11.jar
-file.reference.commons-collections-3.2.2.jar=release\\modules\\ext\\commons-collections-3.2.2.jar
 file.reference.commons-dbcp2-2.1.1.jar=release\\modules\\ext\\commons-dbcp2-2.1.1.jar
-file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar
-file.reference.commons-lang-2.6.jar=release\\modules\\ext\\commons-lang-2.6.jar
 file.reference.commons-lang3-3.5.jar=release\\modules\\ext\\commons-lang3-3.5.jar
-file.reference.commons-logging-1.2.jar=release\\modules\\ext\\commons-logging-1.2.jar
 file.reference.commons-pool2-2.4.2.jar=release\\modules\\ext\\commons-pool2-2.4.2.jar
 file.reference.java-diff-utils-4.8.jar=release\\modules\\ext\\java-diff-utils-4.8.jar
-file.reference.commons-validator-1.6.jar=release\\modules\\ext\\commons-validator-1.6.jar
 file.reference.curator-client-2.8.0.jar=release\\modules\\ext\\curator-client-2.8.0.jar
 file.reference.curator-framework-2.8.0.jar=release\\modules\\ext\\curator-framework-2.8.0.jar
 file.reference.curator-recipes-2.8.0.jar=release\\modules\\ext\\curator-recipes-2.8.0.jar
@@ -65,8 +57,6 @@ file.reference.j2objc-annotations-1.1.jar=release\\modules\\ext\\j2objc-annotati
 file.reference.jackcess-2.2.0.jar=release\\modules\\ext\\jackcess-2.2.0.jar
 file.reference.jackcess-encrypt-2.1.4.jar=release\\modules\\ext\\jackcess-encrypt-2.1.4.jar
 file.reference.jackson-annotations-2.9.0.jar=release\\modules\\ext\\jackson-annotations-2.9.0.jar
-file.reference.jackson-core-2.9.7.jar=release\\modules\\ext\\jackson-core-2.9.7.jar
-file.reference.jackson-databind-2.9.7.jar=release\\modules\\ext\\jackson-databind-2.9.7.jar
 file.reference.jackson-dataformat-csv-2.9.7.jar=release\\modules\\ext\\jackson-dataformat-csv-2.9.7.jar
 file.reference.jai_core-1.1.3.jar=release\\modules\\ext\\jai_core-1.1.3.jar
 file.reference.jai_imageio-1.1.jar=release\\modules\\ext\\jai_imageio-1.1.jar
@@ -75,7 +65,6 @@ file.reference.javax.ws.rs-api-2.0.jar=release\\modules\\ext\\javax.ws.rs-api-2.
 file.reference.jcommon-1.0.23.jar=release/modules/ext/jcommon-1.0.23.jar
 file.reference.jdom-2.0.5-contrib.jar=release\\modules\\ext\\jdom-2.0.5-contrib.jar
 file.reference.jdom-2.0.5.jar=release\\modules\\ext\\jdom-2.0.5.jar
-file.reference.jericho-html-3.3.jar=release\\modules\\ext\\jericho-html-3.3.jar
 file.reference.jfreechart-1.0.19.jar=release/modules/ext/jfreechart-1.0.19.jar
 file.reference.jgraphx-4.1.0.jar=release\\modules\\ext\\jgraphx-4.1.0.jar
 file.reference.jline-0.9.94.jar=release\\modules\\ext\\jline-0.9.94.jar
@@ -87,7 +76,6 @@ file.reference.jython-standalone-2.7.0.jar=release\\modules\\ext\\jython-standal
 file.reference.libphonenumber-3.5.jar=release\\modules\\ext\\libphonenumber-3.5.jar
 file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release\\modules\\ext\\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 file.reference.log4j-1.2.16.jar=release\\modules\\ext\\log4j-1.2.16.jar
-file.reference.mchange-commons-java-0.2.9.jar=release\\modules\\ext\\mchange-commons-java-0.2.9.jar
 file.reference.metadata-extractor-2.11.0.jar=release\\modules\\ext\\metadata-extractor-2.11.0.jar
 file.reference.netty-3.7.0.Final.jar=release\\modules\\ext\\netty-3.7.0.Final.jar
 file.reference.okhttp-2.7.5.jar=release\\modules\\ext\\okhttp-2.7.5.jar
@@ -95,7 +83,6 @@ file.reference.okio-1.6.0.jar=release\\modules\\ext\\okio-1.6.0.jar
 file.reference.opencensus-api-0.19.2.jar=release\\modules\\ext\\opencensus-api-0.19.2.jar
 file.reference.opencensus-contrib-grpc-metrics-0.19.2.jar=release\\modules\\ext\\opencensus-contrib-grpc-metrics-0.19.2.jar
 file.reference.opencensus-contrib-http-util-0.19.2.jar=release\\modules\\ext\\opencensus-contrib-http-util-0.19.2.jar
-file.reference.opennlp-tools-1.9.1.jar=release\\modules\\ext\\opennlp-tools-1.9.1.jar
 file.reference.postgresql-42.2.18.jar=release\\modules\\ext\\postgresql-42.2.18.jar
 file.reference.proto-google-cloud-translate-v3beta1-0.53.0.jar=release\\modules\\ext\\proto-google-cloud-translate-v3beta1-0.53.0.jar
 file.reference.proto-google-common-protos-1.15.0.jar=release\\modules\\ext\\proto-google-common-protos-1.15.0.jar
@@ -110,7 +97,6 @@ file.reference.sleuthkit-caseuco-4.11.1.jar=release/modules/ext/sleuthkit-caseuc
 file.reference.slf4j-api-1.7.6.jar=release\\modules\\ext\\slf4j-api-1.7.6.jar
 file.reference.slf4j-log4j12-1.7.6.jar=release\\modules\\ext\\slf4j-log4j12-1.7.6.jar
 file.reference.SparseBitSet-1.1.jar=release\\modules\\ext\\SparseBitSet-1.1.jar
-file.reference.sqlite-jdbc-3.25.2.jar=release\\modules\\ext\\sqlite-jdbc-3.25.2.jar
 file.reference.StixLib.jar=release\\modules\\ext\\StixLib.jar
 file.reference.threetenbp-1.3.3.jar=release\\modules\\ext\\threetenbp-1.3.3.jar
 file.reference.webp-imageio-sejda-0.1.0.jar=release\\modules\\ext\\webp-imageio-sejda-0.1.0.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 6b4135b384..0c51d6bacd 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -394,10 +394,6 @@
                 <runtime-relative-path>ext/api-common-1.7.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\api-common-1.7.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-databind-2.9.7.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-databind-2.9.7.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jackson-dataformat-csv-2.9.7.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jackson-dataformat-csv-2.9.7.jar</binary-origin>
@@ -438,10 +434,6 @@
                 <runtime-relative-path>ext/metadata-extractor-2.11.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\metadata-extractor-2.11.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-codec-1.11.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/postgresql-42.2.18.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\postgresql-42.2.18.jar</binary-origin>
@@ -514,10 +506,6 @@
                 <runtime-relative-path>ext/google-http-client-1.29.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\google-http-client-1.29.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/opennlp-tools-1.9.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\opennlp-tools-1.9.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/bcprov-ext-jdk15on-1.54.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\bcprov-ext-jdk15on-1.54.jar</binary-origin>
@@ -534,10 +522,6 @@
                 <runtime-relative-path>ext/bcpkix-jdk15on-1.54.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\bcpkix-jdk15on-1.54.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sqlite-jdbc-3.25.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\sqlite-jdbc-3.25.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/grpc-protobuf-lite-1.19.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\grpc-protobuf-lite-1.19.0.jar</binary-origin>
@@ -586,18 +570,10 @@
                 <runtime-relative-path>ext/slf4j-log4j12-1.7.6.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\slf4j-log4j12-1.7.6.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jericho-html-3.3.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/google-cloud-core-grpc-1.70.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\google-cloud-core-grpc-1.70.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-validator-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-validator-1.6.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-api-1.7.6.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\slf4j-api-1.7.6.jar</binary-origin>
@@ -618,10 +594,6 @@
                 <runtime-relative-path>ext/jackson-annotations-2.9.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jackson-annotations-2.9.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-core-2.9.7.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-core-2.9.7.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang3-3.5.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\commons-lang3-3.5.jar</binary-origin>
@@ -630,10 +602,6 @@
                 <runtime-relative-path>ext/log4j-1.2.16.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\log4j-1.2.16.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-logging-1.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</binary-origin>
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index b49490c79f..f4a529620d 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -5,51 +5,54 @@
         <conf name="autopsy_core"/>
         
     </configurations>
-    <dependencies>
-        <!-- for ingest -->
-        <dependency conf="autopsy_core->*" org="org.reflections" name="reflections" rev="0.9.8"/>
-        
-        <dependency org="com.google.code.gson" name="gson" rev="2.8.5"/>      
-        <dependency org="com.apple" name="AppleJavaExtensions" rev="1.4"/>
+    <dependencies>       
+        <dependency conf="autopsy_core->default" org="com.google.code.gson" name="gson" rev="2.8.5"/>     
         
         <!-- for viewers -->
-        <dependency conf="autopsy_core->*" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.4.0"/>
-        <dependency conf="autopsy_core->*" org="net.java.dev.jna" name="jna-platform" rev="5.10.0"/>
+        <dependency conf="autopsy_core->default" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.4.0"/>
+        <dependency conf="autopsy_core->default" org="net.java.dev.jna" name="jna-platform" rev="5.10.0"/>
         
         <!-- for file search -->
-        <dependency conf="autopsy_core->*" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="10.3.1"/>
+        <dependency conf="autopsy_core->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="10.3.1"/>
         
+        <dependency conf="autopsy_core->default" org="commons-codec" name="commons-codec" rev="1.13"/>
+
         <!-- commmon -->
-        <dependency org="com.google.guava" name="guava" rev="19.0"/>
-        <dependency conf="autopsy_core->*" org="org.apache.commons" name="commons-lang3" rev="3.4"/>
-        <dependency conf="autopsy_core->*" org="org.apache.commons" name="commons-csv" rev="1.4"/>
+        <dependency conf="autopsy_core->*" org="com.google.guava" name="guava" rev="19.0"/>
+        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-lang3" rev="3.8.1"/>
+        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-csv" rev="1.4"/>
     
         <!-- keep old commons-lang because some deps may need it at runtime. 
         Note there is no namespace collision with ver 3 -->
-        <dependency conf="autopsy_core->*" org="commons-lang" name="commons-lang" rev="2.6"/> 
-        <dependency conf="autopsy_core->*" org="commons-logging" name="commons-logging" rev="1.1.2"/>
-        <dependency conf="autopsy_core->*" org="commons-io" name="commons-io" rev="2.5"/>
-        <dependency conf="autopsy_core->*" org="log4j" name="log4j" rev="1.2.17"/>
-        <!-- <dependency conf="autopsy_core->*" org="org.jdom" name="jdom" rev="1.1.3"/> -->
-        <dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-excelant" rev="4.0.1"/>
-        <dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-scratchpad" rev="4.0.1"/>
-        
+        <dependency conf="autopsy_core->default" org="commons-lang" name="commons-lang" rev="2.6"/> 
+        <dependency conf="autopsy_core->default" org="commons-logging" name="commons-logging" rev="1.2"/>
+        <dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.5"/>
+        <dependency conf="autopsy_core->default" org="log4j" name="log4j" rev="1.2.17"/>
+        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-excelant" rev="4.0.1"/>
+        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-scratchpad" rev="4.0.1"/>
+        <dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.6"/>
+
+        <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
+
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-core" rev="2.9.7"/>
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.9.7"/>
+
         <!-- process and system monitoring, note: matching native libs pulled from thirdparty -->
-        <dependency conf="autopsy_core->*" org="org.fusesource" name="sigar" rev="1.6.4" />
+        <dependency conf="autopsy_core->default" org="org.fusesource" name="sigar" rev="1.6.4" />
         
         <!-- better image resizing -->
-        <dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
+        <dependency conf="autopsy_core->default" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
         
         <!-- timeline and image analyzer -->
-        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.11" />
+        <dependency conf="autopsy_core->default" org="org.controlsfx" name="controlsfx" rev="8.40.11" />
 
         <!-- timeline  -->
-        <dependency conf="autopsy_core->*" org="joda-time" name="joda-time" rev="2.4" />
-        <dependency conf="autopsy_core->*" org="org.jfxtras" name="jfxtras-fxml" rev="8.0-r4" />
-        <dependency conf="autopsy_core->*" org="org.jfxtras" name="jfxtras-controls" rev="8.0-r4" />
-        <dependency conf="autopsy_core->*" org="org.jfxtras" name="jfxtras-common" rev="8.0-r4" />
+        <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.4" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="8.0-r4" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="8.0-r4" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="8.0-r4" />
         <!-- templateing engine used by timeline to generate its snapshot report -->
-        <dependency conf="autopsy_core->*" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.1" />
+        <dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.1" />
         
         <!-- image support for autopsy and image gallery -->
         <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="3.2" />
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 65e740fc47..a640701b34 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -1,24 +1,22 @@
-file.reference.activation-1.1.jar=release/modules/ext/activation-1.1.jar
 file.reference.ant-1.8.2.jar=release/modules/ext/ant-1.8.2.jar
+file.reference.commons-codec-1.13.jar=release/modules/ext/commons-codec-1.13.jar
+file.reference.jackson-core-2.9.7.jar=release/modules/ext/jackson-core-2.9.7.jar
+file.reference.jackson-databind-2.9.7.jar=release/modules/ext/jackson-databind-2.9.7.jar
+file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar
 file.reference.ant-launcher-1.8.2.jar=release/modules/ext/ant-launcher-1.8.2.jar
-file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar
-file.reference.avalon-framework-4.1.5.jar=release/modules/ext/avalon-framework-4.1.5.jar
 file.reference.common-image-3.2.jar=release/modules/ext/common-image-3.2.jar
 file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar
 file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar
-file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar
 file.reference.commons-collections4-4.2.jar=release\\modules\\ext\\commons-collections4-4.2.jar
 file.reference.commons-compress-1.18.jar=release/modules/ext/commons-compress-1.18.jar
 file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar
 file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar
 file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar
 file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
-file.reference.commons-lang3-3.4.jar=release/modules/ext/commons-lang3-3.4.jar
-file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar
+file.reference.commons-lang3-3.8.1.jar=release/modules/ext/commons-lang3-3.8.1.jar
+file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
 file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar
 file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar
-file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
-file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
 file.reference.gson-2.8.5.jar=release/modules/ext/gson-2.8.5.jar
 file.reference.gst1-java-core-1.0.0.jar=release\\modules\\ext\\gst1-java-core-1.0.0.jar
 file.reference.guava-19.0.jar=release/modules/ext/guava-19.0.jar
@@ -37,8 +35,6 @@ file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar
 file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar
 file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar
 file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar
-file.reference.javaee-api-5.0-2.jar=release/modules/ext/javaee-api-5.0-2.jar
-file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar
 file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar
 file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar
 file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar
@@ -48,8 +44,6 @@ file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar
 file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
 file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar
 file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
-file.reference.logkit-1.0.1.jar=release/modules/ext/logkit-1.0.1.jar
-file.reference.mail-1.4.3.jar=release/modules/ext/mail-1.4.3.jar
 file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
 file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar
 file.reference.poi-4.0.1.jar=release\\modules\\ext\\poi-4.0.1.jar
@@ -57,14 +51,12 @@ file.reference.poi-excelant-4.0.1.jar=release\\modules\\ext\\poi-excelant-4.0.1.
 file.reference.poi-ooxml-4.0.1.jar=release\\modules\\ext\\poi-ooxml-4.0.1.jar
 file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar
 file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.jar
-file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
-file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.jar
 file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar
-file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar
-file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar
-file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
 file.reference.xmlbeans-3.0.2.jar=release/modules/ext/xmlbeans-3.0.2.jar
 file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar
+file.reference.c3p0-0.9.5.jar=release\\modules\\ext\\c3p0-0.9.5.jar
+file.reference.commons-validator-1.6.jar=release\\modules\\ext\\commons-validator-1.6.jar
+file.reference.sqlite-jdbc-3.25.2.jar=release\\modules\\ext\\sqlite-jdbc-3.25.2.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar
@@ -75,7 +67,6 @@ javadoc.reference.guava-19.0.jar=release/modules/ext/guava-19.0-javadoc.jar
 javadoc.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-javadoc.jar
-javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar
 nbm.needs.restart=true
 source.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-sources.jar
 source.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5-sources.jar
@@ -85,4 +76,5 @@ source.reference.guava-19.0.jar=release/modules/ext/guava-19.0-sources.jar
 source.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-sources.jar
 source.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-sources.jar
 source.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-sources.jar
-source.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-sources.jar
+file.reference.mchange-commons-java-0.2.9.jar=release\\modules\\ext\\mchange-commons-java-0.2.9.jar
+
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 39cb46f4fd..3e3d92f580 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -33,11 +33,19 @@
                 </test-type>
             </test-dependencies>
             <public-packages>
-                <package>com.apple.concurrent</package>
-                <package>com.apple.eawt</package>
-                <package>com.apple.eawt.event</package>
-                <package>com.apple.eio</package>
+                <package>org.sqlite</package>
                 <package>com.dd.plist</package>
+                <package>com.fasterxml.jackson.core</package>
+                <package>com.fasterxml.jackson.core.base</package>
+                <package>com.fasterxml.jackson.core.type</package>
+                <package>com.fasterxml.jackson.core.util</package>
+                <package>com.fasterxml.jackson.databind</package>
+                <package>com.fasterxml.jackson.databind.annotation</package>
+                <package>com.fasterxml.jackson.databind.cfg</package>
+                <package>com.fasterxml.jackson.databind.deser</package>
+                <package>com.fasterxml.jackson.databind.deser.std</package>
+                <package>com.fasterxml.jackson.databind.node</package>
+                <package>com.fasterxml.jackson.databind.type</package>
                 <package>com.github.lgooddatepicker.components</package>
                 <package>com.github.lgooddatepicker.optionalusertools</package>
                 <package>com.github.lgooddatepicker.zinternaltools</package>
@@ -88,8 +96,6 @@
                 <package>com.microsoft.schemas.office.x2006.keyEncryptor.password.impl</package>
                 <package>com.microsoft.schemas.vml</package>
                 <package>com.microsoft.schemas.vml.impl</package>
-                <package>com.sun.activation.registries</package>
-                <package>com.sun.activation.viewers</package>
                 <package>com.sun.jna</package>
                 <package>com.sun.jna.platform</package>
                 <package>com.sun.jna.platform.dnd</package>
@@ -99,15 +105,6 @@
                 <package>com.sun.jna.platform.wince</package>
                 <package>com.sun.jna.ptr</package>
                 <package>com.sun.jna.win32</package>
-                <package>com.sun.mail.auth</package>
-                <package>com.sun.mail.handlers</package>
-                <package>com.sun.mail.iap</package>
-                <package>com.sun.mail.imap</package>
-                <package>com.sun.mail.imap.protocol</package>
-                <package>com.sun.mail.pop3</package>
-                <package>com.sun.mail.smtp</package>
-                <package>com.sun.mail.util</package>
-                <package>com.sun.mail.util.logging</package>
                 <package>com.twelvemonkeys.image</package>
                 <package>com.twelvemonkeys.imageio</package>
                 <package>com.twelvemonkeys.imageio.color</package>
@@ -143,94 +140,9 @@
                 <package>com.twelvemonkeys.util.regex</package>
                 <package>com.twelvemonkeys.util.service</package>
                 <package>com.twelvemonkeys.xml</package>
-                <package>javassist</package>
-                <package>javassist.bytecode</package>
-                <package>javassist.bytecode.analysis</package>
-                <package>javassist.bytecode.annotation</package>
-                <package>javassist.bytecode.stackmap</package>
-                <package>javassist.compiler</package>
-                <package>javassist.compiler.ast</package>
-                <package>javassist.convert</package>
-                <package>javassist.expr</package>
-                <package>javassist.runtime</package>
-                <package>javassist.scopedpool</package>
-                <package>javassist.tools</package>
-                <package>javassist.tools.reflect</package>
-                <package>javassist.tools.rmi</package>
-                <package>javassist.tools.web</package>
-                <package>javassist.util</package>
-                <package>javassist.util.proxy</package>
-                <package>javax.activation</package>
                 <package>javax.annotation</package>
                 <package>javax.annotation.concurrent</package>
                 <package>javax.annotation.meta</package>
-                <package>javax.annotation.security</package>
-                <package>javax.ejb</package>
-                <package>javax.ejb.spi</package>
-                <package>javax.enterprise.deploy.model</package>
-                <package>javax.enterprise.deploy.model.exceptions</package>
-                <package>javax.enterprise.deploy.shared</package>
-                <package>javax.enterprise.deploy.shared.factories</package>
-                <package>javax.enterprise.deploy.spi</package>
-                <package>javax.enterprise.deploy.spi.exceptions</package>
-                <package>javax.enterprise.deploy.spi.factories</package>
-                <package>javax.enterprise.deploy.spi.status</package>
-                <package>javax.interceptor</package>
-                <package>javax.jms</package>
-                <package>javax.jws</package>
-                <package>javax.jws.soap</package>
-                <package>javax.mail</package>
-                <package>javax.mail.event</package>
-                <package>javax.mail.internet</package>
-                <package>javax.mail.search</package>
-                <package>javax.mail.util</package>
-                <package>javax.management.j2ee</package>
-                <package>javax.management.j2ee.statistics</package>
-                <package>javax.persistence</package>
-                <package>javax.persistence.spi</package>
-                <package>javax.resource</package>
-                <package>javax.resource.cci</package>
-                <package>javax.resource.spi</package>
-                <package>javax.resource.spi.endpoint</package>
-                <package>javax.resource.spi.security</package>
-                <package>javax.resource.spi.work</package>
-                <package>javax.security.jacc</package>
-                <package>javax.servlet</package>
-                <package>javax.servlet.http</package>
-                <package>javax.transaction</package>
-                <package>javax.transaction.xa</package>
-                <package>javax.xml</package>
-                <package>javax.xml.bind</package>
-                <package>javax.xml.bind.annotation</package>
-                <package>javax.xml.bind.annotation.adapters</package>
-                <package>javax.xml.bind.attachment</package>
-                <package>javax.xml.bind.helpers</package>
-                <package>javax.xml.bind.util</package>
-                <package>javax.xml.namespace</package>
-                <package>javax.xml.parsers</package>
-                <package>javax.xml.registry</package>
-                <package>javax.xml.registry.infomodel</package>
-                <package>javax.xml.rpc</package>
-                <package>javax.xml.rpc.encoding</package>
-                <package>javax.xml.rpc.handler</package>
-                <package>javax.xml.rpc.handler.soap</package>
-                <package>javax.xml.rpc.holders</package>
-                <package>javax.xml.rpc.server</package>
-                <package>javax.xml.rpc.soap</package>
-                <package>javax.xml.soap</package>
-                <package>javax.xml.stream</package>
-                <package>javax.xml.stream.events</package>
-                <package>javax.xml.stream.util</package>
-                <package>javax.xml.transform</package>
-                <package>javax.xml.transform.dom</package>
-                <package>javax.xml.transform.sax</package>
-                <package>javax.xml.transform.stream</package>
-                <package>javax.xml.ws</package>
-                <package>javax.xml.ws.handler</package>
-                <package>javax.xml.ws.handler.soap</package>
-                <package>javax.xml.ws.http</package>
-                <package>javax.xml.ws.soap</package>
-                <package>javax.xml.ws.spi</package>
                 <package>jfxtras.animation</package>
                 <package>jfxtras.css</package>
                 <package>jfxtras.css.converters</package>
@@ -238,16 +150,8 @@
                 <package>jfxtras.scene.control</package>
                 <package>jfxtras.scene.layout</package>
                 <package>jfxtras.util</package>
-                <package>org.apache.avalon.framework</package>
-                <package>org.apache.avalon.framework.activity</package>
-                <package>org.apache.avalon.framework.component</package>
-                <package>org.apache.avalon.framework.configuration</package>
-                <package>org.apache.avalon.framework.container</package>
-                <package>org.apache.avalon.framework.context</package>
-                <package>org.apache.avalon.framework.logger</package>
-                <package>org.apache.avalon.framework.parameters</package>
-                <package>org.apache.avalon.framework.service</package>
-                <package>org.apache.avalon.framework.thread</package>
+                <package>net.htmlparser.jericho</package>
+                <package>net.htmlparser.jericho.nodoc</package>
                 <package>org.apache.commons.codec</package>
                 <package>org.apache.commons.codec.binary</package>
                 <package>org.apache.commons.codec.cli</package>
@@ -334,18 +238,8 @@
                 <package>org.apache.commons.lang3.tuple</package>
                 <package>org.apache.commons.logging</package>
                 <package>org.apache.commons.logging.impl</package>
-                <package>org.apache.geronimo.mail.handlers</package>
-                <package>org.apache.geronimo.mail.util</package>
-                <package>org.apache.log</package>
-                <package>org.apache.log.filter</package>
-                <package>org.apache.log.format</package>
-                <package>org.apache.log.output</package>
-                <package>org.apache.log.output.db</package>
-                <package>org.apache.log.output.io</package>
-                <package>org.apache.log.output.io.rotate</package>
-                <package>org.apache.log.output.jms</package>
-                <package>org.apache.log.output.net</package>
-                <package>org.apache.log.util</package>
+                <package>org.apache.commons.validator.routines</package>
+                <package>org.apache.commons.validator.routines.checkdigit</package>
                 <package>org.apache.log4j</package>
                 <package>org.apache.log4j.chainsaw</package>
                 <package>org.apache.log4j.config</package>
@@ -630,7 +524,6 @@
                 <package>org.apache.xmlbeans.xml.stream</package>
                 <package>org.apache.xmlbeans.xml.stream.events</package>
                 <package>org.apache.xmlbeans.xml.stream.utils</package>
-                <package>org.apache.xmlcommons</package>
                 <package>org.controlsfx.control</package>
                 <package>org.controlsfx.control.action</package>
                 <package>org.controlsfx.control.cell</package>
@@ -646,20 +539,6 @@
                 <package>org.controlsfx.tools</package>
                 <package>org.controlsfx.validation</package>
                 <package>org.controlsfx.validation.decoration</package>
-                <package>org.dom4j</package>
-                <package>org.dom4j.bean</package>
-                <package>org.dom4j.datatype</package>
-                <package>org.dom4j.dom</package>
-                <package>org.dom4j.dtd</package>
-                <package>org.dom4j.io</package>
-                <package>org.dom4j.jaxb</package>
-                <package>org.dom4j.rule</package>
-                <package>org.dom4j.rule.pattern</package>
-                <package>org.dom4j.swing</package>
-                <package>org.dom4j.tree</package>
-                <package>org.dom4j.util</package>
-                <package>org.dom4j.xpath</package>
-                <package>org.dom4j.xpp</package>
                 <package>org.etsi.uri.x01903.v13</package>
                 <package>org.etsi.uri.x01903.v13.impl</package>
                 <package>org.freedesktop.gstreamer</package>
@@ -730,30 +609,9 @@
                 <package>org.openxmlformats.schemas.wordprocessingml.x2006.main.impl</package>
                 <package>org.openxmlformats.schemas.xpackage.x2006.digitalSignature</package>
                 <package>org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl</package>
-                <package>org.reflections</package>
-                <package>org.reflections.adapters</package>
-                <package>org.reflections.scanners</package>
-                <package>org.reflections.serializers</package>
-                <package>org.reflections.util</package>
-                <package>org.reflections.vfs</package>
                 <package>org.sleuthkit.autopsy.corelibs</package>
-                <package>org.slf4j</package>
-                <package>org.slf4j.helpers</package>
-                <package>org.slf4j.impl</package>
-                <package>org.slf4j.spi</package>
                 <package>org.w3.x2000.x09.xmldsig</package>
                 <package>org.w3.x2000.x09.xmldsig.impl</package>
-                <package>org.w3c.dom</package>
-                <package>org.w3c.dom.css</package>
-                <package>org.w3c.dom.events</package>
-                <package>org.w3c.dom.html</package>
-                <package>org.w3c.dom.ranges</package>
-                <package>org.w3c.dom.stylesheets</package>
-                <package>org.w3c.dom.traversal</package>
-                <package>org.w3c.dom.views</package>
-                <package>org.xml.sax</package>
-                <package>org.xml.sax.ext</package>
-                <package>org.xml.sax.helpers</package>
                 <package>repackage</package>
                 <package>schemaorg_apache_xmlbeans.system.s8C3F193EE11A2F798ACF65489B9E6078</package>
                 <package>schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443</package>
@@ -762,21 +620,25 @@
                 <package>schemaorg_apache_xmlbeans.system.sXMLSCHEMA</package>
                 <package>schemaorg_apache_xmlbeans.system.sXMLTOOLS</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-codec-1.13.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-codec-1.13.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-thumbsdb-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-thumbsdb-3.2.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jericho-html-3.3.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/ant-launcher-1.8.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/ant-launcher-1.8.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/logkit-1.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/logkit-1.0.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/gst1-java-core-1.4.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\gst1-java-core-1.4.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/gst1-java-core-1.4.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-jpeg-3.2.jar</runtime-relative-path>
@@ -790,6 +652,30 @@
                 <runtime-relative-path>ext/LGoodDatePicker-10.3.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/LGoodDatePicker-10.3.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/c3p0-0.9.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/c3p0-0.9.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sqlite-jdbc-3.25.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sqlite-jdbc-3.25.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-validator-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-validator-1.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/mchange-commons-java-0.2.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/mchange-commons-java-0.2.9.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-core-2.9.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-core-2.9.7.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-databind-2.9.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-databind-2.9.7.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-iff-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-iff-3.2.jar</binary-origin>
@@ -798,10 +684,6 @@
                 <runtime-relative-path>ext/imageio-icns-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-icns-3.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/AppleJavaExtensions-1.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sigar-1.6.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sigar-1.6.4.jar</binary-origin>
@@ -818,17 +700,13 @@
                 <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imgscalr-lib-4.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imgscalr-lib-4.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.4.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-lang3-3.4.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang3-3.8.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang3-3.8.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/common-io-3.2.jar</runtime-relative-path>
@@ -838,10 +716,6 @@
                 <runtime-relative-path>ext/xmlbeans-3.0.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xmlbeans-3.0.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/mail-1.4.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/mail-1.4.3.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-tga-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-tga-3.2.jar</binary-origin>
@@ -850,33 +724,17 @@
                 <runtime-relative-path>ext/imageio-pnm-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-pnm-3.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/activation-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/activation-1.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-scratchpad-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-scratchpad-4.0.1.jar</binary-origin>
+                <binary-origin>release/modules/ext/poi-scratchpad-4.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-psd-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-psd-3.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-ooxml-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-ooxml-4.0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-codec-1.11.jar</binary-origin>
+                <binary-origin>release/modules/ext/poi-ooxml-4.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-pcx-3.2.jar</runtime-relative-path>
@@ -886,10 +744,6 @@
                 <runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/avalon-framework-4.1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/avalon-framework-4.1.5.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-tiff-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-tiff-3.2.jar</binary-origin>
@@ -906,10 +760,6 @@
                 <runtime-relative-path>ext/imageio-sgi-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-sgi-3.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/geronimo-jms_1.1_spec-1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/geronimo-jms_1.1_spec-1.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jfxtras-fxml-8.0-r4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jfxtras-fxml-8.0-r4.jar</binary-origin>
@@ -924,16 +774,12 @@
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jna-platform-5.10.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jna-platform-5.10.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/jna-platform-5.10.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/guava-19.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/guava-19.0.jar</binary-origin>
@@ -944,7 +790,7 @@
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-collections4-4.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-collections4-4.2.jar</binary-origin>
+                <binary-origin>release/modules/ext/commons-collections4-4.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-bmp-3.2.jar</runtime-relative-path>
@@ -952,55 +798,43 @@
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jna-5.10.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jna-5.10.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/jna-5.10.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/reflections-0.9.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/reflections-0.9.8.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/ant-1.8.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/ant-1.8.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-core-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-core-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-4.0.1.jar</binary-origin>
+                <binary-origin>release/modules/ext/poi-4.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-excelant-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-excelant-4.0.1.jar</binary-origin>
+                <binary-origin>release/modules/ext/poi-excelant-4.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/controlsfx-8.40.11.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/controlsfx-8.40.11.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/javaee-api-5.0-2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javaee-api-5.0-2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/common-image-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/common-image-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-ooxml-schemas-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-ooxml-schemas-4.0.1.jar</binary-origin>
+                <binary-origin>release/modules/ext/poi-ooxml-schemas-4.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-pict-3.2.jar</runtime-relative-path>
@@ -1014,10 +848,6 @@
                 <runtime-relative-path>ext/dd-plist-1.20.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/dd-plist-1.20.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-metadata-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-metadata-3.2.jar</binary-origin>
diff --git a/Experimental/ivy.xml b/Experimental/ivy.xml
index 207cc89e96..24982bee01 100644
--- a/Experimental/ivy.xml
+++ b/Experimental/ivy.xml
@@ -5,11 +5,6 @@
         <conf name="experimental"/>
     </configurations>
     <dependencies>
-        <dependency conf="experimental->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="10.3.1"/>
-        <dependency conf="experimental->default" org="org.postgresql" name="postgresql" rev="42.2.18"/>
-        <dependency conf="experimental->default" org="com.mchange" name="c3p0" rev="0.9.5"/>
-        <dependency conf="experimental->default" org="com.fasterxml.jackson.core" name="jackson-core" rev="2.7.0"/>
-        <dependency conf="experimental->default" org="org.swinglabs.swingx" name="swingx-all" rev="1.6.4"/>
         <dependency conf="experimental->default" org="net.sf.jtidy" name="jtidy" rev="r938"/>
     </dependencies>
 </ivy-module>
diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties
index 0df575faba..fdb072a092 100644
--- a/Experimental/nbproject/project.properties
+++ b/Experimental/nbproject/project.properties
@@ -1,11 +1,5 @@
-file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar
-file.reference.jackson-core-2.7.0.jar=release/modules/ext/jackson-core-2.7.0.jar
 file.reference.jtidy-r938.jar=release/modules/ext/jtidy-r938.jar
-file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar
-file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar
 file.reference.postgresql-9.4-1201-jdbc41.jar=release/modules/ext/postgresql-9.4-1201-jdbc41.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
-javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar
-source.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-sources.jar
 spec.version.base=1.0
diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml
index 34734e4954..26eeafb76c 100644
--- a/Experimental/nbproject/project.xml
+++ b/Experimental/nbproject/project.xml
@@ -174,22 +174,6 @@
                 <runtime-relative-path>ext/jtidy-r938.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jtidy-r938.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/LGoodDatePicker-10.3.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/LGoodDatePicker-10.3.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/mchange-commons-java-0.2.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/mchange-commons-java-0.2.9.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-core-2.7.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-core-2.7.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/c3p0-0.9.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/c3p0-0.9.5.jar</binary-origin>
-            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/ImageGallery/nbproject/project.properties b/ImageGallery/nbproject/project.properties
index e400c96aab..97db9c68a4 100644
--- a/ImageGallery/nbproject/project.properties
+++ b/ImageGallery/nbproject/project.properties
@@ -1,4 +1,3 @@
-file.reference.sqlite-jdbc-3.7.8-SNAPSHOT.jar=release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=LICENSE-2.0.txt
diff --git a/ImageGallery/nbproject/project.xml b/ImageGallery/nbproject/project.xml
index 0c5fd31fca..9436402881 100644
--- a/ImageGallery/nbproject/project.xml
+++ b/ImageGallery/nbproject/project.xml
@@ -141,10 +141,6 @@
                 </dependency>
             </module-dependencies>
             <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>ext/sqlite-jdbc-3.25.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sqlite-jdbc-3.25.2.jar</binary-origin>
-            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index db2f503672..c72f69919f 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -15,42 +15,30 @@
     </configurations>
     <dependencies>
         <!-- Solr -->
-	<dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file for embedded Solr 4 -->
-        <dependency name="solr-cell" rev="8.11.1" org="org.apache.solr" conf="solr-libs->default"/>
+	    <dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file for embedded Solr 4 -->
+        
+        <dependency conf="solr-libs->default" name="solr-cell" rev="8.11.1" org="org.apache.solr"/>
         
         <!-- Autopsy -->
-        <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="8.11.1"/>
-        <dependency conf="autopsy->*" org="commons-lang" name="commons-lang" rev="2.4"/>
-        <dependency conf="autopsy->*" org="commons-validator" name="commons-validator" rev="1.5.1"/>
-        <dependency conf="autopsy->*" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>
+        <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.1"/>
+        <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>
         <!-- Exclude the version of cxf-rt-rs-client from Tika 1.20, one of its depedencies breaks Ivy -->
-        <dependency conf="autopsy->*" org="org.apache.tika" name="tika-parsers" rev="1.20">
+        <dependency conf="autopsy->default" org="org.apache.tika" name="tika-parsers" rev="1.20">
             <exclude module="cxf-rt-rs-client"/>
             <exclude module="cleartk-ml"/>
         </dependency>
         
-        <dependency conf="autopsy->*" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.3.0"/>
-        <dependency conf="autopsy->*" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/>
+        <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.3.0"/>
+        <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/>
         
         <!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
         <dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="3.8"/>
-        <dependency conf="autopsy->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
         
         <!-- Jetty -->
-		<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="8.1.16.v20140903"/> <!-- for embedded Solr 4 -->
+		<!-- <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="8.1.16.v20140903"/>
         <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="8.1.16.v20140903"/>
         <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.16.v20140903"/>
-        <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
-
-        <!-- logging -->
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.10"/>
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="1.7.10"/>
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.10"/>
-        
-        <!-- Remnants of a past Tika dependency. These jars were being exported from Tika, which has since 
-             moved into it's own NBM. For sake of backwards compatibility, these are still provided. -->
-        <dependency conf="autopsy->default" org="org.apache.httpcomponents" name="httpclient" rev="4.5.6"/>
-        <dependency conf="autopsy->default" org="org.apache.httpcomponents" name="httpmime" rev="4.5.6"/>
+        <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/> -->
         
         <exclude org="*" ext="*" type="javadoc"/>
     </dependencies>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index df914dd442..d0d3372397 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -3,39 +3,26 @@ file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar
 file.reference.c3p0-0.9.1.1.jar=release/modules/ext/c3p0-0.9.1.1.jar
 file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar
 file.reference.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar
-file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils-1.9.2.jar
-file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar
 file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar
 file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar
 file.reference.commons-io-2.6.jar=release/modules/ext/commons-io-2.6.jar
-file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
-file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
-file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar
 file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
-file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar
 file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar
 file.reference.guava-18.0.jar=release/modules/ext/guava-18.0.jar
 file.reference.httpclient-4.5.10.jar=release/modules/ext/httpclient-4.5.10.jar
 file.reference.httpcore-4.4.12.jar=release/modules/ext/httpcore-4.4.12.jar
-file.reference.httpmime-4.5.10.jar=release/modules/ext/httpmime-4.5.10.jar
 file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar
 file.reference.icu4j-3.8.jar=release/modules/ext/icu4j-3.8.jar
 file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar
 file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar
 file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar
-file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar
-file.reference.jericho-html-3.3.jar=release\\modules\\ext\\jericho-html-3.3.jar
 file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
 file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
 file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
 file.reference.language-detector-0.6.jar=release\\modules\\ext\\language-detector-0.6.jar
-file.reference.libsvm-3.1.jar=release/modules/ext/libsvm-3.1.jar
 file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
 file.reference.lucene-core-4.0.0.jar=release/modules/ext/lucene-core-4.0.0.jar
-file.reference.lucene-queries-4.0.0.jar=release/modules/ext/lucene-queries-4.0.0.jar
-file.reference.lucene-sandbox-4.0.0.jar=release/modules/ext/lucene-sandbox-4.0.0.jar
 file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar
-file.reference.openaifsm-0.0.1.jar=release/modules/ext/openaifsm-0.0.1.jar
 file.reference.opennlp-maxent-3.0.3.jar=release/modules/ext/opennlp-maxent-3.0.3.jar
 file.reference.poi-4.0.1.jar=release/modules/ext/poi-4.0.1.jar
 file.reference.poi-ooxml-4.0.1.jar=release/modules/ext/poi-ooxml-4.0.1.jar
@@ -64,6 +51,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/autopsy/
 nbm.needs.restart=true
-source.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1-sources.jar 
 source.reference.solr-solrj-8.11.1.jar=release/modules/ext/solr-solrj-8.11.1-sources.jar
 spec.version.base=6.6
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 6a3345927e..254b123328 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -216,10 +216,6 @@
                 <package>org.codehaus.stax2.validation</package>
                 <package>org.sleuthkit.autopsy.keywordsearch</package>
             </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/findstructapi-0.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/findstructapi-0.0.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\commons-digester-1.8.1.jar</binary-origin>
@@ -232,18 +228,6 @@
                 <runtime-relative-path>ext/vorbis-java-core-0.8.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/vorbis-java-core-0.8.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/lucene-sandbox-4.0.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/lucene-sandbox-4.0.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpmime-4.5.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpmime-4.5.10.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jericho-html-3.3.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/netcdf4-4.5.5.jar</binary-origin>
@@ -264,10 +248,6 @@
                 <runtime-relative-path>ext/protobuf-java-2.5.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/protobuf-java-2.5.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/lucene-queries-4.0.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/lucene-queries-4.0.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/boilerpipe-1.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/boilerpipe-1.1.0.jar</binary-origin>
@@ -276,18 +256,10 @@
                 <runtime-relative-path>ext/juniversalchardet-1.0.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/juniversalchardet-1.0.3.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/quartz-2.2.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/quartz-2.2.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/libsvm-3.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/libsvm-3.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-api-1.7.25.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/slf4j-api-1.7.25.jar</binary-origin>
@@ -316,14 +288,6 @@
                 <runtime-relative-path>ext/jcip-annotations-1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jcip-annotations-1.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-validator-1.5.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-validator-1.5.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-logging-1.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/bzip2-0.9.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/bzip2-0.9.1.jar</binary-origin>
@@ -340,14 +304,6 @@
                 <runtime-relative-path>ext/httpcore-4.4.12.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/httpcore-4.4.12.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jdom-1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-beanutils-1.9.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-beanutils-1.9.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/ehcache-core-2.6.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/ehcache-core-2.6.2.jar</binary-origin>
@@ -360,10 +316,6 @@
                 <runtime-relative-path>ext/zookeeper-3.6.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/zookeeper-3.6.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-collections-3.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-collections-3.2.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-io-2.6.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-io-2.6.jar</binary-origin>
@@ -372,10 +324,6 @@
                 <runtime-relative-path>ext/annotations-12.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\annotations-12.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/openaifsm-0.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/openaifsm-0.0.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/stax2-api-3.1.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/stax2-api-3.1.4.jar</binary-origin>
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index d6b88685c4..3bf8acc267 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -10,7 +10,6 @@ file.reference.bzip2-0.9.1.jar=release\\modules\\ext\\bzip2-0.9.1.jar
 file.reference.c3p0-0.9.5.4.jar=release\\modules\\ext\\c3p0-0.9.5.4.jar
 file.reference.cdm-4.5.5.jar=release\\modules\\ext\\cdm-4.5.5.jar
 file.reference.checker-qual-2.8.1.jar=release\\modules\\ext\\checker-qual-2.8.1.jar
-file.reference.commons-codec-1.13.jar=release\\modules\\ext\\commons-codec-1.13.jar
 file.reference.commons-collections4-4.4.jar=release\\modules\\ext\\commons-collections4-4.4.jar
 file.reference.commons-compress-1.19.jar=release\\modules\\ext\\commons-compress-1.19.jar
 file.reference.commons-csv-1.7.jar=release\\modules\\ext\\commons-csv-1.7.jar
@@ -44,9 +43,6 @@ file.reference.istack-commons-runtime-3.0.8.jar=release\\modules\\ext\\istack-co
 file.reference.j2objc-annotations-1.3.jar=release\\modules\\ext\\j2objc-annotations-1.3.jar
 file.reference.jackcess-3.0.1.jar=release\\modules\\ext\\jackcess-3.0.1.jar
 file.reference.jackcess-encrypt-3.0.0.jar=release\\modules\\ext\\jackcess-encrypt-3.0.0.jar
-file.reference.jackson-annotations-2.10.1.jar=release\\modules\\ext\\jackson-annotations-2.10.1.jar
-file.reference.jackson-core-2.10.1.jar=release\\modules\\ext\\jackson-core-2.10.1.jar
-file.reference.jackson-databind-2.10.1.jar=release\\modules\\ext\\jackson-databind-2.10.1.jar
 file.reference.jai-imageio-core-1.4.0.jar=release\\modules\\ext\\jai-imageio-core-1.4.0.jar
 file.reference.jakarta.activation-1.2.1.jar=release\\modules\\ext\\jakarta.activation-1.2.1.jar
 file.reference.jakarta.ws.rs-api-2.1.5.jar=release\\modules\\ext\\jakarta.ws.rs-api-2.1.5.jar
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index 7cd7a69bbf..20cc21d7be 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -166,10 +166,6 @@
                 <runtime-relative-path>ext/poi-ooxml-schemas-4.1.1.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\poi-ooxml-schemas-4.1.1.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.13.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-codec-1.13.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/fontbox-2.0.17.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\fontbox-2.0.17.jar</binary-origin>
@@ -274,10 +270,6 @@
                 <runtime-relative-path>ext/jaxb-runtime-2.3.2.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jaxb-runtime-2.3.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-core-2.10.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-core-2.10.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opennlp-tools-1.9.1.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\opennlp-tools-1.9.1.jar</binary-origin>
@@ -350,10 +342,6 @@
                 <runtime-relative-path>ext/jempbox-1.8.16.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jempbox-1.8.16.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-annotations-2.10.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-annotations-2.10.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/httpmime-4.5.10.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\httpmime-4.5.10.jar</binary-origin>
@@ -518,10 +506,6 @@
                 <runtime-relative-path>ext/cxf-core-3.3.4.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\cxf-core-3.3.4.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-databind-2.10.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-databind-2.10.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-api-1.7.28.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\slf4j-api-1.7.28.jar</binary-origin>
diff --git a/thunderbirdparser/ivy.xml b/thunderbirdparser/ivy.xml
index 477c8b9cbb..7705b809b9 100644
--- a/thunderbirdparser/ivy.xml
+++ b/thunderbirdparser/ivy.xml
@@ -7,13 +7,9 @@
      
     </configurations>
     <dependencies>
-        <dependency conf="autopsy->default" org="org.apache.commons" name="commons-lang3" rev="3.8.1"/>
         <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-core" rev="0.8.0"/>
         <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-dom" rev="0.8.0"/>
         <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.0"/>
         <dependency conf="autopsy->default" org="com.googlecode.ez-vcard" name="ez-vcard" rev="0.10.5"/>
-        <dependency conf="autopsy->default" org="com.github.mangstadt" name="vinnie" rev="2.0.2"/>
-        <dependency org="com.google.guava" name="guava" rev="19.0"/>
-        <dependency org="commons-validator" name="commons-validator" rev="1.6"/>
     </dependencies>
 </ivy-module>
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index 5ed2afa7b7..9f082b2bb0 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -5,7 +5,6 @@ file.reference.commons-lang3-3.8.1.jar=release/modules/ext/commons-lang3-3.8.1.j
 file.reference.apache-mime4j-core-0.8.0.jar=release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar
 file.reference.apache-mime4j-dom-0.8.0.jar=release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar
 file.reference.apache-mime4j-mbox-iterator-0.8.0.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar
-file.reference.commons-validator-1.6.jar=release/modules/ext/commons-validator-1.6.jar
 file.reference.guava-19.0.jar=release/modules/ext/guava-19.0.jar
 file.reference.ez-vcard-0.10.5.jar=release/modules/ext/ez-vcard-0.10.5.jar
 file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index 333bbf6578..dc11895d68 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -57,6 +57,15 @@
                         <specification-version>10.24</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>3</release-version>
+                        <specification-version>1.4</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.keywordsearch</code-name-base>
                     <build-prerequisite/>
@@ -100,10 +109,6 @@
                 <runtime-relative-path>ext/vinnie-2.0.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/vinnie-2.0.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-validator-1.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-validator-1.6.jar</binary-origin>
-            </class-path-extension>
         </data>
     </configuration>
 </project>