diff --git a/Manifests/Manifest_LAOS-11.0.xml b/Manifests/Manifest_LAOS-11.0.xml
index 10ddce93..eea5bf1a 100644
--- a/Manifests/Manifest_LAOS-11.0.xml
+++ b/Manifests/Manifest_LAOS-11.0.xml
@@ -66,23 +66,11 @@
 	<remove-project name="platform/tools/emulator" />
 <!-- END OF UNNECESSARY REPO REMOVAL -->
 
-<!-- START OF ADDITIONAL REPOS -->
-	<project path="external/swiftshader" name="google/swiftshader" remote="github" revision="master" />
-
-	<!-- F-Droid -->
-	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
-	<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />
-<!-- END OF ADDITIONAL REPOS -->
-
 <!-- START OF DEVICE REPOS -->
 	<!-- ZTE AWE (n800) -->
 	<project path="device/zte/nex" name="spock1104/android_device_zte_nex" remote="github" revision="cm11_newkern" />
 	<project path="device/qcom/common" name="LineageOS/android_device_qcom_common" remote="github" revision="cm-11.0" />
 	<project path="kernel/zte/msm8930" name="spock1104/android_kernel_zte_msm8930" remote="github" revision="stockmod" />
-
-	<!-- Nexus 7 [2012] (grouper) -->
-	<project path="device/asus/grouper" name="LineageOS/android_device_asus_grouper" remote="github" />
-	<project path="kernel/asus/grouper" name="LineageOS/android_kernel_asus_grouper" remote="github" />
 <!-- END OF DEVICE REPOS -->
 
 </manifest>
diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk
index 092b6c86..00615ffd 100644
--- a/Patches/Common/android_vendor_divested/packages.mk
+++ b/Patches/Common/android_vendor_divested/packages.mk
@@ -1,7 +1,8 @@
 # F-Droid
 PRODUCT_PACKAGES += \
     F-DroidOfficial \
-    F-DroidPrivilegedExtensionOfficial
+    F-DroidPrivilegedExtension
+#    F-DroidPrivilegedExtensionOfficial
 
 # UnifiedNLP
 PRODUCT_PACKAGES += \
diff --git a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_asus_grouper.sh
deleted file mode 100644
index d4b6cc95..00000000
--- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_asus_grouper.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/asus/grouper"
-git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6689/^3.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6701/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6704/^3.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2015/^3.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1739/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2523/^3.13/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9683/^3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9715/^3.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9895/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1534/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2041/^3.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2686/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7550/^4.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8215/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8944/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0723/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0821/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2384/^4.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2438/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2544/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2545/^4.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2546/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2549/^4.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3134/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4569/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4578/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4578/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5829/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6753/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6828/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7910/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7915/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8399/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9604/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9793/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9794/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0403/3.0-^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0404/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000380/^4.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13215/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15265/^4.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.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-17806/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6074/^4.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
-git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
-git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-editKernelLocalversion "-dos.p77"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh
index 2895aad3..fbf352b3 100644
--- a/Scripts/LineageOS-11.0/Functions.sh
+++ b/Scripts/LineageOS-11.0/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-07-10
 
 patchAllKernels() {
-	startPatcher "kernel_asus_grouper kernel_zte_msm8930";
+	startPatcher "kernel_zte_msm8930";
 }
 export -f patchAllKernels;
 
@@ -49,7 +49,6 @@ export -f buildDeviceDebug;
 buildAll() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
 	#Select devices are userdebug due to SELinux policy issues
-	brunch lineage_grouper-userdebug;
 	brunch lineage_nex-userdebug;
 }
 export -f buildAll;
@@ -57,6 +56,9 @@ export -f buildAll;
 patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi;
 	#source build/envsetup.sh;
+	#repopick -it asb-2018.09-cm11
+	#repopick -it asb-2018.10-cm11
+	#repopick -it asb-2018.11-cm11
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-11.0/Patch.sh b/Scripts/LineageOS-11.0/Patch.sh
index 1db268f9..dddf3501 100644
--- a/Scripts/LineageOS-11.0/Patch.sh
+++ b/Scripts/LineageOS-11.0/Patch.sh
@@ -115,12 +115,6 @@ if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_
 #
 #START OF DEVICE CHANGES
 #
-enterAndClear "device/asus/grouper";
-mv cm.mk lineage.mk;
-sed -i 's/cm_/lineage_/' lineage.mk;
-#In proprietary/Android.mk
-#	Remove widevine and tf_daemon
-
 enterAndClear "device/zte/nex"
 sed -i 's/ro.sf.lcd_density=240/ro.sf.lcd_density=180/' system.prop;
 echo "TARGET_DISPLAY_USE_RETIRE_FENCE := true" >> BoardConfig.mk;