diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml
index 0fa75ac0..cb6b9c25 100644
--- a/Manifests/Manifest_LAOS-16.0.xml
+++ b/Manifests/Manifest_LAOS-16.0.xml
@@ -67,7 +67,6 @@
 
 <!-- START OF ADDITIONAL REPOS -->
 	<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
-	<project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" groups="pdk,linux,arm" clone-depth="1" remote="aosp" revision="refs/tags/android-8.1.0_r81" />
 
 	<!-- GrapheneOS -->
 	<project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="464bfd4d829927f19fd5d2729a101ee241319d1e" />
diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index 41b80636..58ce5070 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -65,7 +65,6 @@
 
 <!-- START OF ADDITIONAL REPOS -->
 	<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
-	<project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" groups="pdk,linux,arm" clone-depth="1" remote="aosp" revision="refs/tags/android-8.1.0_r81" />
 
 	<!-- GrapheneOS -->
 	<project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="526ccd915180ae9d0464f4e92c1c485c2ec91dec" />
diff --git a/Manifests/Manifest_LAOS-18.1.xml b/Manifests/Manifest_LAOS-18.1.xml
index f8e7fe79..9c3aa4dc 100644
--- a/Manifests/Manifest_LAOS-18.1.xml
+++ b/Manifests/Manifest_LAOS-18.1.xml
@@ -65,13 +65,6 @@
 	<project path="external/swiftshader" name="google/swiftshader" remote="github" revision="master" />-->
 <!-- END OF BRANCH SWITCHING -->
 
-<!-- START OF ADDITIONAL REPOS -->
-	<project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" groups="pdk,linux,arm" clone-depth="1" remote="aosp" revision="refs/tags/android-8.1.0_r81" />
-
-	<!-- GrapheneOS -->
-	<project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="11" />
-<!-- END OF ADDITIONAL REPOS -->
-
 <!-- START OF DEVICE REPOS -->
 	<!-- Common -->
 	<project path="system/qcom" name="LineageOS/android_system_qcom" remote="github" />
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index 1f7d9831..997326be 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -495,7 +495,7 @@ hardenUserdata() {
 	#TODO: Ensure: noatime,nosuid,nodev
 	sed -i '/\/data/{/discard/!s|nosuid|discard,nosuid|}' fstab.* root/fstab.* rootdir/fstab.* rootdir/*/fstab.* &>/dev/null || true;
 	if [ "$1" != "device/samsung/tuna" ] && [ "$1" != "device/amazon/hdx-common" ]; then #tuna needs first boot to init, hdx-c has broken encryption
-		sed -i 's|encryptable=|forceencrypt=|' fstab.* root/fstab.* rootdir/fstab.* rootdir/*/fstab.* &>/dev/null || true;
+		sed -i 's|encryptable=/|forceencrypt=/|' fstab.* root/fstab.* rootdir/fstab.* rootdir/*/fstab.* &>/dev/null || true;
 	fi;
 	echo "Hardened /data for $1";
 	cd "$DOS_BUILD_BASE";
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
index a25c928d..b63b9b9a 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 cd "$DOS_BUILD_BASE""kernel/essential/msm8998"
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0260-0261.patch --exclude=Makefile
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0263-0264.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch
@@ -39,7 +37,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9711/4.4/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16644/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.7/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18306/4.4/0003.patch
@@ -91,11 +88,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16232/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19060/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11234/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11234/ANY/0002.patch
@@ -103,13 +97,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch
-editKernelLocalversion "-dos.p111"
+editKernelLocalversion "-dos.p97"
 cd "$DOS_BUILD_BASE"