diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index 55c2e7b0..20b0d432 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -93,15 +93,10 @@
 	<project path="device/google/sailfish" name="LineageOS/android_device_google_sailfish" remote="github" />
 	<project path="kernel/google/marlin" name="LineageOS/android_kernel_google_marlin" remote="github" />
 
-	<!-- Google Pixel 3 (crosshatch/blueline) -->
-	<project path="device/google/crosshatch" name="LineageOS/android_device_google_crosshatch" remote="github" />
-	<project path="device/google/blueline" name="LineageOS/android_device_google_blueline" remote="github" />
-	<project path="kernel/google/msm-4.9" name="LineageOS/android_kernel_google_msm-4.9" remote="github" />
-
 	<!-- Google Pixel 3a (bonito/sargo) -->
 	<project path="device/google/bonito" name="LineageOS/android_device_google_bonito" remote="github" />
 	<project path="device/google/sargo" name="LineageOS/android_device_google_sargo" remote="github" />
-	<!-- uses google/msm-4.9 kernel -->
+	<project path="kernel/google/msm-4.9" name="LineageOS/android_kernel_google_msm-4.9" remote="github" />
 
 	<!-- Moto G 3rd Gen (osprey)
 	<project path="device/motorola/msm8916-common" name="LineageOS/android_device_motorola_msm8916-common" remote="github" />
@@ -129,10 +124,6 @@
 	<project path="device/oneplus/oneplus2" name="LineageOS/android_device_oneplus_oneplus2" remote="github" />
 	<project path="kernel/oneplus/msm8994" name="LineageOS/android_kernel_oneplus_msm8994" remote="github" />
 
-	<!-- OnePlus 3(T) (oneplus3) -->
-	<project path="device/oneplus/oneplus3" name="LineageOS/android_device_oneplus_oneplus3" remote="github" />
-	<project path="kernel/oneplus/msm8996" name="LineageOS/android_kernel_oneplus_msm8996" remote="github" />
-
 	<!-- OnePlus 7 (guacamoleb) -->
 	<project path="device/oneplus/sm8150-common" name="LineageOS/android_device_oneplus_sm8150-common" remote="github" />
 	<project path="device/oneplus/guacamoleb" name="LineageOS/android_device_oneplus_guacamoleb" remote="github" />
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
deleted file mode 100644
index d3827e73..00000000
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ /dev/null
@@ -1,371 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/oneplus/msm8996"
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0019.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0020.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0022.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0023.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0025.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0027.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0028.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0029.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0030.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0031.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0032.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0033.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0034.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0035.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0036.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0037.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0040.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0041.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0042.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0043.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0045.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0046.patch
-git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.18/0050.patch
-git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1339/^4.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2041/^3.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-5257/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7515/^4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7833/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7884/^4.3.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7885/^4.3.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8104/^4.2.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8709/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8845/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8953/^4.2.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/3.18/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2184/3.18/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2549/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2550/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2782/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3136/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3137/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3138/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3140/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3672/^4.5.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6130/^4.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6197/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8394/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8630/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8646/^4.3.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9756/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10741/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10906/^4.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-GadgetFS/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-GadgetFS/ANY/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-GadgetFS/ANY/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-GadgetFS/ANY/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-GadgetFS/ANY/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-2583/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5549/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5551/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13220/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.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-14883/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16644/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16914/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16994/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16995/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17741/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18216/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18509/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18551/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000370/^4.11.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1066/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5825/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5953/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8087/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11506/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12232/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12896/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18690/^4.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19824/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20856/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-21008/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-1999/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2025/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3701/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3819/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3846/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3882/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6133/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6974/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7221/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7222/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9213/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9245/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9453/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/3.18/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10638/^4.1/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11190/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12614/^5.1.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12818/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12881/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13648/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14284/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14814/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14895/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14901/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15117/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15118/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15211/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15214/^5.0.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15215/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15217/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15218/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15219/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15220/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15292/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15505/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15666/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16232/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17053/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17054/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17055/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17056/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17075/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17133/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17666/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18683/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18806/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19052/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19056/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19057/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19060/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19062/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19063/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19227/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19332/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19447/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19530/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19531/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19532/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19533/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19534/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19536/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19537/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19815/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/3.18/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/3.18/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.18/0010.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.18/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.18/0012.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8694/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10720/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10769/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10942/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11309/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11609/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11668/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12652/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12654/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/3.18/0009.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15436/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27675/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0015.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28688/3.18/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
-editKernelLocalversion "-dos.p367"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index bc9ef800..4f785648 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2020-04-14
 
 patchAllKernels() {
-	startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996";
+	startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996";
 }
 export -f patchAllKernels;
 
@@ -65,16 +65,12 @@ buildAll() {
 	buildDevice oneplus2;
 	#SD820
 	buildDevice griffin;
-	buildDevice oneplus3 verity; #18.1 not compiling
 	buildDevice z2_plus verity;
 	#SD821
 	buildDevice marlin verity;
 	buildDevice sailfish verity;
 	#SD632
 	buildDevice FP3 avb;
-	#SD845
-	buildDevice crosshatch avb;
-	buildDevice blueline avb;
 	#SD855
 	buildDevice guacamoleb avb;
 	#SD660
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index c22f50a9..d1995837 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -237,9 +237,6 @@ enterAndClear "device/google/bonito";
 enableVerity; #Resurrect dm-verity
 awk -i inplace '!/INODE_COUNT/' BoardConfig-lineage.mk; #mke2fs -1 incompatibility (?)
 
-enterAndClear "device/google/crosshatch";
-enableVerity; #Resurrect dm-verity
-
 enterAndClear "device/google/marlin";
 git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carrier blobs
 
@@ -289,7 +286,6 @@ removeBuildFingerprints;
 sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/yellowstone/arch/arm*/configs/*_defconfig; #Breaks on compile
 sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/lge/mako/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
 sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*_defconfig; #Breaks on compile
-sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/oneplus/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
 
 sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index f7dbe712..5aa7141b 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -75,7 +75,7 @@ buildAll() {
 	buildDevice rs988;
 	buildDevice h990;
 	buildDevice us996;
-	buildDevice oneplus3 verity; #broken yyloc
+	buildDevice oneplus3 verity; #needs manual patching - broken yyloc
 	#SD835
 	buildDevice cheryl verity;
 	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile