diff --git a/build.sh b/build.sh
index fd2e5f6..a488faa 100644
--- a/build.sh
+++ b/build.sh
@@ -27,12 +27,25 @@ for i in output/*; do
     mv "$i" "${i/1~w2d0/$REVISION}"
 done
 
-# Moving the shaders library over to essentials since it's required by Qt5Compat
-mv output/python3-pyside6-addons_*_amd64/src/PySide6/Qt/lib/libQt6ShaderTools.so.6 output/python3-pyside6-essentials_*_amd64/src/PySide6/Qt/lib/
+# Removing android deploy libs because they cause issues at installation.
+rm -rf output/python3-pyside6-essentials_*_amd64/src/PySide6/scripts/deploy_lib/android
 
 # Remove conflicting files between Essentials and Addons
-rm output/python3-pyside6-addons_*_amd64/src/PySide6/{__init__.py,_config.py,_git_pyside_version.py}
-rm -r output/python3-pyside6-addons_*_amd64/src/PySide6/{QtAsyncio,support,scripts}
+rm output/python3-pyside6-addons_*_amd64/src/PySide6/{__init__.py,_config.py,_git_pyside_version.py,__feature__.pyi,py.typed}
+
+for file in output/python3-pyside6-essentials_*_amd64/src/PySide6/Qt*.pyi; do
+    if [ ! -f "${file%.*}.abi3.so" ]; then 
+        echo "Removing $file..."
+        rm "$file"
+    fi
+done
+
+for file in output/python3-pyside6-addons_*_amd64/src/PySide6/Qt*.pyi; do
+    if [ ! -f "${file%.*}.abi3.so" ]; then 
+        echo "Removing $file..."
+        rm "$file"
+    fi
+done
 
 # Removing conflictual directories
 rm -rf output/python3-pyside6-addons_*_amd64/src/shiboken6*
@@ -41,6 +54,6 @@ rm -rf output/python3-shiboken6_*_amd64/src/PySide6
 
 function filter() { cat "$1" | awk "$2" > "$1"; }
 
-filter output/python3-shiboken6_*_amd64/debian/install '/^src\/shiboken6/ { print $0; }'
-filter output/python3-pyside6-essentials_*_amd64/debian/install '/^src\/PySide6/ { print $0; }'
-filter output/python3-pyside6-addons_*_amd64/debian/install '/^src\/PySide6/ { print $0; }'
+# filter output/python3-shiboken6_*_amd64/debian/install '/^src\/shiboken6/ { print $0; }'
+# filter output/python3-pyside6-essentials_*_amd64/debian/install '/^src\/PySide6/ { print $0; }'
+# filter output/python3-pyside6-addons_*_amd64/debian/install '/^src\/PySide6/ { print $0; }'