diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index e88cc02c..941b258f 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -97,13 +97,6 @@
 	<project path="device/asus/Z00T" name="LineageOS/android_device_asus_Z00T" remote="github" />
 	<project path="kernel/asus/msm8916" name="LineageOS/android_kernel_asus_msm8916" remote="github" />
 
-	<!-- Google Project Tango (yellowstone) -->
-	<project path="device/google/yellowstone" name="LineageOS/android_device_google_yellowstone" remote="github" />
-	<project path="kernel/google/yellowstone" name="LineageOS/android_kernel_google_yellowstone" remote="github" />
-	<project path="hardware/nvidia/libstagefrighthw" name="LineageOS/android_hardware_nvidia_libstagefrighthw" remote="github" />
-	<project path="hardware/nvidia/power" name="LineageOS/android_hardware_nvidia_power" remote="github" />
-	<project path="hardware/nvidia/thermal" name="LineageOS/android_hardware_nvidia_thermal" remote="github" />
-
 	<!-- Google Pixel C (dragon) -->
 	<project path="device/google/dragon" name="LineageOS/android_device_google_dragon" remote="github" />
 	<project path="kernel/google/dragon" name="LineageOS/android_kernel_google_dragon" remote="github" />
@@ -113,38 +106,13 @@
 	<project path="device/htc/hima-common" name="LineageOS/android_device_htc_hima-common" remote="github" />
 	<project path="kernel/htc/msm8994" name="LineageOS/android_kernel_htc_msm8994" remote="github" />
 
-	<!-- LG G2 (d802) -->
-	<project path="device/lge/g2-common" name="LineageOS/android_device_lge_g2-common" remote="github" />
-	<project path="device/lge/d802" name="LineageOS/android_device_lge_d802" remote="github" />
-	<project path="kernel/lge/msm8974" name="LineageOS/android_kernel_lge_msm8974" remote="github" />
-
-	<!-- LG G5 (h850:intl, rs988:us) -->
+	<!-- LG G6 (h870:intl, us997:us) -->
 	<project path="device/lge/common" name="LineageOS/android_device_lge_common" remote="github" />
-	<project path="device/lge/g5-common" name="LineageOS/android_device_lge_g5-common" remote="github" />
-	<project path="device/lge/h850" name="LineageOS/android_device_lge_h850" remote="github" />
-	<project path="device/lge/rs988" name="LineageOS/android_device_lge_rs988" remote="github" />
 	<project path="device/lge/msm8996-common" name="LineageOS/android_device_lge_msm8996-common" remote="github" />
 	<project path="kernel/lge/msm8996" name="LineageOS/android_kernel_lge_msm8996" remote="github" />
-
-	<!-- LG V20 (h990:intl, us996:us) -->
-	<project path="device/lge/v20-common" name="LineageOS/android_device_lge_v20-common" remote="github" />
-	<project path="device/lge/h990" name="LineageOS/android_device_lge_h990" remote="github" />
-	<project path="device/lge/us996" name="LineageOS/android_device_lge_us996" remote="github" />
-	<!-- uses lge msm8996 commons -->
-
-	<!-- LG G6 (h870:intl, us997:us) -->
 	<project path="device/lge/g6-common" name="LineageOS/android_device_lge_g6-common" remote="github" />
 	<project path="device/lge/h870" name="LineageOS/android_device_lge_h870" remote="github" />
 	<project path="device/lge/us997" name="LineageOS/android_device_lge_us997" remote="github" />
-	<!-- uses lge msm8996 commons -->
-
-	<!-- Moto X 2014 (victara) -->
-	<project path="device/motorola/victara" name="LineageOS/android_device_motorola_victara" remote="github" />
-	<project path="kernel/motorola/msm8974" name="LineageOS/android_kernel_motorola_msm8974" remote="github" />
-
-	<!-- Moto Z (griffin) -->
-	<project path="device/motorola/griffin" name="LineageOS/android_device_motorola_griffin" remote="github" />
-	<project path="kernel/motorola/msm8996" name="LineageOS/android_kernel_motorola_msm8996" remote="github" />
 
 	<!-- Nextbit Robin (ether) -->
 	<project path="device/nextbit/ether" name="LineageOS/android_device_nextbit_ether" remote="github" />
@@ -178,15 +146,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 6 (enchilada) -->
-	<project path="device/oneplus/sdm845-common" name="LineageOS/android_device_oneplus_sdm845-common" remote="github" />
-	<project path="device/oneplus/enchilada" name="LineageOS/android_device_oneplus_enchilada" remote="github" />
-	<project path="kernel/oneplus/sdm845" name="LineageOS/android_kernel_oneplus_sdm845" remote="github" />
-
 	<!-- Samsung Common -->
 	<project path="device/samsung/qcom-common" name="LineageOS/android_device_samsung_qcom-common" remote="github" />
 	<project path="hardware/samsung" name="LineageOS/android_hardware_samsung" remote="github" />
@@ -196,36 +155,10 @@
 	<project path="device/samsung/i9100" name="LineageOS/android_device_samsung_i9100" remote="github" />
 	<project path="device/samsung/galaxys2-common" name="LineageOS/android_device_samsung_galaxys2-common" remote="github" />
 
-	<!-- Samsung Galaxy S9 (starlte) -->
-	<project path="device/samsung/starlte" name="LineageOS/android_device_samsung_starlte" remote="github" />
-	<project path="device/samsung/star-common" name="LineageOS/android_device_samsung_star-common" remote="github" />
-	<project path="device/samsung/universal9810-common" name="LineageOS/android_device_samsung_universal9810-common" remote="github" />
-	<project path="kernel/samsung/universal9810" name="LineageOS/android_kernel_samsung_universal9810" remote="github" />
-
-	<!-- Samsung Galaxy S9+ (star2lte) -->
-	<project path="device/samsung/star2lte" name="LineageOS/android_device_samsung_star2lte" remote="github" />
-
-	<!-- Wileyfox Storm (kipper) -->
-	<project path="device/wileyfox/kipper" name="LineageOS/android_device_wileyfox_kipper" remote="github" />
-	<project path="device/cyanogen/msm8916-common" name="LineageOS/android_device_cyanogen_msm8916-common" remote="github" />
-	<project path="kernel/cyanogen/msm8916" name="LineageOS/android_kernel_cyanogen_msm8916" remote="github" />
-
-	<!-- Wileyfox Swift (crackling) -->
-	<project path="device/wileyfox/crackling" name="LineageOS/android_device_wileyfox_crackling" remote="github" />
-
-	<!-- Xiaomi Poco F1 (beryllium) -->
-	<project path="device/xiaomi/beryllium" name="LineageOS/android_device_xiaomi_beryllium" remote="github" />
-	<project path="device/xiaomi/sdm845-common" name="LineageOS/android_device_xiaomi_sdm845-common" remote="github" />
-	<project path="kernel/xiaomi/sdm845" name="LineageOS/android_kernel_xiaomi_sdm845" remote="github" />
-
 	<!-- ZTE Axon 7 (axon7) -->
 	<project path="device/zte/axon7" name="LineageOS/android_device_zte_axon7" remote="github" />
 	<project path="kernel/zte/msm8996" name="LineageOS/android_kernel_zte_msm8996" remote="github" />
 
-	<!-- Zuk Z1 (ham) -->
-	<project path="device/zuk/ham" name="LineageOS/android_device_zuk_ham" remote="github" />
-	<project path="kernel/cyanogen/msm8974" name="LineageOS/android_kernel_cyanogen_msm8974" remote="github" />
-
 	<!-- NXP
 	<project path="vendor/nxp-nfc/opensource/frameworks" name="LineageOS/android_vendor_nxp-nfc_opensource_frameworks" remote="github" />
 	<project path="vendor/nxp-nfc/opensource/libnfc-nci" name="LineageOS/android_vendor_nxp-nfc_opensource_libnfc-nci" remote="github" />
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 9f303a9b..458ddec5 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-04-27
 
 patchAllKernels() {
-	startPatcher "kernel_asus_fugu kernel_asus_msm8916 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_google_dragon kernel_google_marlin kernel_google_msm kernel_google_yellowstone kernel_htc_flounder kernel_htc_msm8994 kernel_huawei_angler kernel_lge_bullhead kernel_lge_hammerhead kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_samsung_smdk4412 kernel_samsung_universal9810 kernel_xiaomi_sdm845 kernel_zte_msm8996";
+	startPatcher "kernel_asus_fugu kernel_asus_msm8916 kernel_google_dragon kernel_google_msm kernel_htc_flounder kernel_htc_msm8994 kernel_huawei_angler kernel_lge_bullhead kernel_lge_hammerhead kernel_lge_msm8996 kernel_moto_shamu kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_samsung_smdk4412 kernel_zte_msm8996";
 }
 export -f patchAllKernels;
 
@@ -59,41 +59,30 @@ buildAll() {
 	cd "$DOS_BUILD_BASE";
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
 	if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
-	buildDevice bullhead verity;
-	#buildDevice himaul; #broken - needs vendor bits
+	#SD801
+	buildDevice hammerhead; #16.0 has bluetooth issues?
+	#SD805
+	buildDevice shamu verity; #Last version with working IMS
+	#SD808
 	buildDevice angler verity;
+	buildDevice bullhead verity;
+	buildDevice ether; #Last version with working IMS
+	#SD810
+	buildDevice himaul; #broken - needs vendor bits
+	buildDevice oneplus2; #Last version with working IMS + broken - needs vendor patching
+	#SD615
 	buildDevice Z00T; #broken - needs vendor patching
+	#SD820
 	buildDevice axon7; #broken - needs vendor patching
 	buildDevice h870;
 	buildDevice us997;
+	#Exynos
+	buildDeviceUserDebug i9100;
+	#Intel
+	buildDevice fugu;
+	#Tegra
 	buildDevice flounder verity;
 	buildDevice dragon verity;
-
-	#The following are all superseded, and should only be enabled if the newer version is broken (not building/booting/etc.)
-	buildDevice hammerhead; #16.0 has bluetooth issues?
-	buildDevice shamu verity; #Last version with working IMS
-	buildDevice oneplus2; #Last version with working IMS + broken - needs vendor patching
-	buildDevice ether; #Last version with working IMS
-	buildDevice fugu;
-	if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
-		buildDevice crackling;
-		buildDevice d802;
-		buildDevice ham;
-		buildDevice victara;
-		buildDevice kipper;
-		buildDevice oneplus3;
-		buildDevice h990;
-		buildDevice us996;
-		buildDevice h850; #broken
-		buildDevice rs988;
-		buildDevice griffin;
-		buildDevice beryllium;
-		buildDevice enchilada avb;
-		buildDeviceUserDebug i9100;
-		buildDevice starlte; #broken - device/samsung/universal9810-common/audio: MODULE.TARGET.SHARED_LIBRARIES.libshim_audio_32 already defined by device/samsung/star-common/audio
-		buildDevice star2lte;
-		buildDevice yellowstone;
-	fi;
 }
 export -f buildAll;
 
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 26cfa56a..19ca34c9 100644
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -241,9 +241,6 @@ sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.t
 enterAndClear "device/moto/shamu";
 #git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO
 
-enterAndClear "device/oneplus/msm8998-common";
-patch -p1 < "$DOS_PATCHES_COMMON/android_device_audio/0001-No_Vorbis_Offload.patch"; #Fix Ogg Vorbis playback
-
 #Make changes to all devices
 cd "$DOS_BUILD_BASE";
 if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableLowRam "{}"'; fi;
@@ -262,11 +259,7 @@ removeBuildFingerprints;
 
 #Fix broken options enabled by hardenDefconfig()
 sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/msm/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
-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_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/lge/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
-sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/motorola/msm8974/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_RANDOMIZE_BASE=y/# CONFIG_RANDOMIZE_BASE is not set/" kernel/samsung/universal9810/arch/arm64/configs/*_defconfig; #Breaks on compile
 sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/zte/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
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 5dddf44c..4a748348 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -72,7 +72,7 @@ buildAll() {
 	buildDevice dumpling verity;
 	#SD845
 	buildDevice beryllium;
-	#Samsung
+	#Exynos
 	buildDeviceUserDebug i9100; #broken - many errors in hardware/samsung/exynos4
 	#Intel
 	buildDevice fugu; #broken - ninja: error: 'libpcre2.so' missing and no known rule to make it