diff --git a/Core/ivy.xml b/Core/ivy.xml
index dc75b644a0..db4b10b228 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -25,12 +25,9 @@
 
         <dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.14.3"/>
 
-        <dependency conf="core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="2.13.2"/>
-
         <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.17.0"/>
         <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="8.12.45" />
 
         <dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/>
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 9f6eb26a9f..55c8db9105 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -18,8 +18,7 @@ file.reference.icepdf-core-6.2.2.jar=release/modules/ext/icepdf-core-6.2.2.jar
 file.reference.icepdf-viewer-6.2.2.jar=release/modules/ext/icepdf-viewer-6.2.2.jar
 file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar
 file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar
-file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annotations-2.13.2.jar
-file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar
+file.reference.jackson-annotations-2.13.1.jar=release/modules/ext/jackson-annotations-2.13.1.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
 file.reference.java-diff-utils-4.11.jar=release/modules/ext/java-diff-utils-4.11.jar
@@ -47,7 +46,6 @@ file.reference.slf4j-api-1.7.30.jar=release/modules/ext/slf4j-api-1.7.30.jar
 file.reference.snakeyaml-1.30.jar=release/modules/ext/snakeyaml-1.30.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.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar
 file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar
 file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar
 file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index cbee2c5300..7e03e6eea3 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -427,12 +427,8 @@
                 <binary-origin>release/modules/ext/jackcess-encrypt-4.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-annotations-2.13.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-annotations-2.13.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-dataformat-csv-2.13.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-dataformat-csv-2.13.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-annotations-2.13.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-annotations-2.13.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jai_core-1.1.3.jar</runtime-relative-path>
@@ -542,10 +538,6 @@
                 <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/webp-imageio-sejda-0.1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/webp-imageio-sejda-0.1.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/xmpcore-6.1.11.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xmpcore-6.1.11.jar</binary-origin>
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index e1c9b75a2a..5947b8c175 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -6,8 +6,11 @@
         
     </configurations>
     <dependencies>       
-        <dependency conf="autopsy_core->default" org="com.google.code.gson" name="gson" rev="2.9.0"/>     
+        <!-- <dependency conf="autopsy_core->default" org="com.google.code.gson" name="gson" rev="2.9.0"/>      -->
         
+        <!-- apple for swing -->
+        <dependency conf="autopsy_core->default" org="com.apple" name="AppleJavaExtensions" rev="1.4"/>
+
         <!-- for viewers -->
         <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"/>
@@ -31,16 +34,17 @@
         <dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.11.0"/>
         <dependency conf="autopsy_core->default" org="log4j" name="log4j" rev="1.2.17"/>
         <dependency conf="autopsy_core->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
-        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-excelant" rev="5.2.2"/>
-        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-scratchpad" rev="5.2.2"/>
+        <!-- <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-excelant" rev="5.2.2"/>
+        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-scratchpad" rev="5.2.2"/> -->
         <dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.7"/>
         <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.4"/>
         <dependency conf="autopsy_core->default" org="commons-collections" name="commons-collections" rev="3.2.2"/>
 
         <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.4"/>
 
-        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-core" rev="2.13.2"/>
-        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.13.2"/>
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="2.13.1"/>
+        <!-- <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-core" rev="2.13.2"/>
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.13.2"/> -->
 
         <!-- process and system monitoring, note: matching native libs pulled from thirdparty -->
         <dependency conf="autopsy_core->default" org="org.fusesource" name="sigar" rev="1.6.4" />
@@ -77,6 +81,7 @@
         <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="3.8.2" />
         <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="3.8.2" />
         <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="3.8.2" />
+        <dependency conf="autopsy_core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/>
         <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.23"/>
         
         <exclude org="*" ext="*" type="javadoc"/>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 2c5ffc3d18..76b3eda5e6 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -2,6 +2,7 @@ file.reference.animal-sniffer-annotations-1.21.jar=release/modules/ext/animal-sn
 file.reference.ant-1.10.12.jar=release/modules/ext/ant-1.10.12.jar
 file.reference.ant-launcher-1.10.12.jar=release/modules/ext/ant-launcher-1.10.12.jar
 file.reference.api-common-2.1.4.jar=release/modules/ext/api-common-2.1.4.jar
+file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar
 file.reference.bcpkix-jdk15on-1.67.jar=release/modules/ext/bcpkix-jdk15on-1.67.jar
 file.reference.bcprov-ext-jdk15on-1.54.jar=release/modules/ext/bcprov-ext-jdk15on-1.54.jar
 file.reference.bcprov-jdk15on-1.67.jar=release/modules/ext/bcprov-jdk15on-1.67.jar
@@ -48,7 +49,7 @@ file.reference.grpc-netty-shaded-1.44.1.jar=release/modules/ext/grpc-netty-shade
 file.reference.grpc-protobuf-1.44.1.jar=release/modules/ext/grpc-protobuf-1.44.1.jar
 file.reference.grpc-protobuf-lite-1.44.1.jar=release/modules/ext/grpc-protobuf-lite-1.44.1.jar
 file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar
-file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar
+file.reference.gson-2.8.9.jar=release/modules/ext/gson-2.8.9.jar
 file.reference.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar
 file.reference.guava-31.0.1-jre.jar=release/modules/ext/guava-31.0.1-jre.jar
 file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar
@@ -69,8 +70,9 @@ file.reference.imageio-thumbsdb-3.8.2.jar=release/modules/ext/imageio-thumbsdb-3
 file.reference.imageio-tiff-3.8.2.jar=release/modules/ext/imageio-tiff-3.8.2.jar
 file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar
 file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar
-file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar
-file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar
+file.reference.jackson-core-2.13.1.jar=release/modules/ext/jackson-core-2.13.1.jar
+file.reference.jackson-databind-2.13.1.jar=release/modules/ext/jackson-databind-2.13.1.jar
+file.reference.jackson-dataformat-csv-2.13.1.jar=release/modules/ext/jackson-dataformat-csv-2.13.1.jar
 file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar
 file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar
 file.reference.jfxtras-common-8.0-r6.jar=release/modules/ext/jfxtras-common-8.0-r6.jar
@@ -88,10 +90,10 @@ file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar
 file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar
 file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar
 file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
-file.reference.poi-5.2.2.jar=release/modules/ext/poi-5.2.2.jar
-file.reference.poi-ooxml-5.2.2.jar=release/modules/ext/poi-ooxml-5.2.2.jar
+file.reference.poi-4.1.2.jar=release/modules/ext/poi-4.1.2.jar
+file.reference.poi-ooxml-4.1.2.jar=release/modules/ext/poi-ooxml-4.1.2.jar
 file.reference.poi-ooxml-schemas-4.1.2.jar=release/modules/ext/poi-ooxml-schemas-4.1.2.jar
-file.reference.poi-scratchpad-5.2.2.jar=release/modules/ext/poi-scratchpad-5.2.2.jar
+file.reference.poi-scratchpad-4.1.2.jar=release/modules/ext/poi-scratchpad-4.1.2.jar
 file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar
 file.reference.proto-google-common-protos-2.7.4.jar=release/modules/ext/proto-google-common-protos-2.7.4.jar
 file.reference.proto-google-iam-v1-1.2.6.jar=release/modules/ext/proto-google-iam-v1-1.2.6.jar
@@ -99,6 +101,7 @@ file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4
 file.reference.protobuf-java-util-3.19.4.jar=release/modules/ext/protobuf-java-util-3.19.4.jar
 file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar
 file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar
+file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar
 file.reference.xmlbeans-5.0.3.jar=release/modules/ext/xmlbeans-5.0.3.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 232220af32..412689f928 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -33,6 +33,10 @@
                 </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>com.dd.plist</package>
                 <package>com.fasterxml.jackson.core</package>
                 <package>com.fasterxml.jackson.core.base</package>
@@ -61,6 +65,7 @@
                 <package>com.fasterxml.jackson.databind.ser.std</package>
                 <package>com.fasterxml.jackson.databind.type</package>
                 <package>com.fasterxml.jackson.databind.util</package>
+                <package>com.fasterxml.jackson.dataformat.csv</package>
                 <package>com.github.lgooddatepicker.components</package>
                 <package>com.github.lgooddatepicker.optionalusertools</package>
                 <package>com.github.lgooddatepicker.zinternaltools</package>
@@ -710,6 +715,10 @@
                 <runtime-relative-path>ext/api-common-2.1.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/api-common-2.1.4.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/bcpkix-jdk15on-1.67.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/bcpkix-jdk15on-1.67.jar</binary-origin>
@@ -895,8 +904,8 @@
                 <binary-origin>release/modules/ext/grpc-stub-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gson-2.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gson-2.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/gson-2.8.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gson-2.8.9.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/gst1-java-core-1.4.0.jar</runtime-relative-path>
@@ -979,12 +988,16 @@
                 <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-core-2.13.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-core-2.13.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-core-2.13.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-core-2.13.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-databind-2.13.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-databind-2.13.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-databind-2.13.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-databind-2.13.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-dataformat-csv-2.13.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-dataformat-csv-2.13.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
@@ -1055,20 +1068,20 @@
                 <binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-5.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-5.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/poi-4.1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-4.1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-5.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-5.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/poi-ooxml-4.1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-4.1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-ooxml-schemas-4.1.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-ooxml-schemas-4.1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-scratchpad-5.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-scratchpad-5.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/poi-scratchpad-4.1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-scratchpad-4.1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/proto-google-cloud-translate-v3beta1-0.83.11.jar</runtime-relative-path>
@@ -1098,6 +1111,10 @@
                 <runtime-relative-path>ext/threetenbp-1.5.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/threetenbp-1.5.2.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/webp-imageio-sejda-0.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/webp-imageio-sejda-0.1.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/xmlbeans-5.0.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xmlbeans-5.0.3.jar</binary-origin>
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 1ce3547daa..76a9fc758a 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -23,7 +23,7 @@
         <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"/>       
         <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.1"/>
-        <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.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="70.1"/>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 374329cff0..01169ed1e0 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -3,7 +3,7 @@ file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar
 file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar
 file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.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.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar
 file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar
 file.reference.commons-io-2.8.0.jar=release/modules/ext/commons-io-2.8.0.jar
 file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index a863e94e31..8945867f1b 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -236,10 +236,10 @@
                 <runtime-relative-path>ext/cdm-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/cdm-4.5.5.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
+            <!-- <class-path-extension>
                 <runtime-relative-path>ext/cleartk-util-2.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/cleartk-util-2.0.0.jar</binary-origin>
-            </class-path-extension>
+            </class-path-extension> -->
             <class-path-extension>
                 <runtime-relative-path>ext/commons-exec-1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-exec-1.3.jar</binary-origin>
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index b57e02ed8c..9c892e1796 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -7,6 +7,10 @@
             <suite-component/>
             <module-dependencies/>
             <public-packages>
+                <package>org.apache.james.mime4j</package>
+                <package>org.apache.james.mime4j.dom</package>
+                <package>org.apache.james.mime4j.message</package>
+                <package>org.apache.james.mime4j.stream</package>
                 <package>org.apache.tika</package>
                 <package>org.apache.tika.concurrent</package>
                 <package>org.apache.tika.config</package>
diff --git a/thunderbirdparser/build.xml b/thunderbirdparser/build.xml
index 8926bca7a9..0690ae52ec 100644
--- a/thunderbirdparser/build.xml
+++ b/thunderbirdparser/build.xml
@@ -20,9 +20,6 @@
     <target name="get-thirdparty-jars" description="get third-party jar dependencies"> 
         <mkdir dir="${ext.dir}"/>
         <copy file="${thirdparty.dir}/java-libpst/java-libpst-0.9.5-SNAPSHOT.jar" todir="${ext.dir}" />
-        <copy file="${thirdparty.dir}/apache-mime4j/apache-mime4j-core-0.8.0-SNAPSHOT.jar" todir="${ext.dir}" />
-        <copy file="${thirdparty.dir}/apache-mime4j/apache-mime4j-dom-0.8.0-SNAPSHOT.jar" todir="${ext.dir}" />
-        <copy file="${thirdparty.dir}/apache-mime4j/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar" todir="${ext.dir}" />
     </target>
 
     <target name="get-deps" depends="init-ivy, get-thirdparty-jars">
diff --git a/thunderbirdparser/ivy.xml b/thunderbirdparser/ivy.xml
index fa545c8813..227611d63d 100644
--- a/thunderbirdparser/ivy.xml
+++ b/thunderbirdparser/ivy.xml
@@ -7,8 +7,6 @@
      
     </configurations>
     <dependencies>
-        <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-core" rev="0.8.6"/>
-        <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-dom" rev="0.8.6"/>
         <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.6"/>
         <dependency conf="autopsy->default" org="com.googlecode.ez-vcard" name="ez-vcard" rev="0.11.3"/>
     </dependencies>
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index 9b7ffce2cc..4eb8919ae9 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -1,6 +1,4 @@
-file.reference.apache-mime4j-core-0.8.6.jar=release/modules/ext/apache-mime4j-core-0.8.6.jar
-file.reference.apache-mime4j-dom-0.8.6.jar=release/modules/ext/apache-mime4j-dom-0.8.6.jar
-file.reference.apache-mime4j-mbox-iterator-0.8.6.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.6.jar
+file.reference.apache-mime4j-mbox-iterator-0.8.4.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar
 file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar
 file.reference.ez-vcard-0.11.3.jar=release/modules/ext/ez-vcard-0.11.3.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 81566b0bf2..6c138cc4df 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -78,16 +78,8 @@
             </module-dependencies>
             <public-packages/>
             <class-path-extension>
-                <runtime-relative-path>ext/apache-mime4j-core-0.8.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/apache-mime4j-core-0.8.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/apache-mime4j-dom-0.8.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/apache-mime4j-dom-0.8.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/apache-mime4j-mbox-iterator-0.8.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/apache-mime4j-mbox-iterator-0.8.6.jar</binary-origin>
+                <runtime-relative-path>ext/apache-mime4j-mbox-iterator-0.8.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang3-3.12.0.jar</runtime-relative-path>