diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index d9b27bb4..4048b1cf 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -20,6 +20,7 @@
 	<remove-project name="LineageOS/android_hardware_intel_img_psb_headers" />
 	<remove-project name="LineageOS/android_hardware_intel_img_psb_video" />
 	<remove-project name="LineageOS/android_hardware_ti_omap4xxx" />
+	<remove-project name="LineageOS/android_packages_apps_Jelly" />
 	<remove-project name="LineageOS/android_packages_apps_LockClock" />
 	<remove-project name="LineageOS/android_packages_apps_ManagedProvisioning" />
 	<remove-project name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />
diff --git a/Patches/LineageOS-14.1/Fennec_DOS-Shim/Android.mk b/Patches/LineageOS-14.1/Fennec_DOS-Shim/Android.mk
deleted file mode 100644
index 9a572af8..00000000
--- a/Patches/LineageOS-14.1/Fennec_DOS-Shim/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Install a shim for Fennec DOS
-# Once a user runs F-Droid for the first time, it'll update and install the real Fennec DOS
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := FennecDOS
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_TARGET_ARCH := arm
-
-LOCAL_OVERRIDES_PACKAGES := Jelly
-
-LOCAL_SRC_FILES := prebuilt/Fennec_DOS-Shim.apk
-
-include $(BUILD_PREBUILT)
diff --git a/Patches/LineageOS-14.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk b/Patches/LineageOS-14.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk
deleted file mode 100644
index c92ca95b..00000000
Binary files a/Patches/LineageOS-14.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk and /dev/null differ
diff --git a/Patches/LineageOS-15.1/Fennec_DOS-Shim/Android.mk b/Patches/LineageOS-15.1/Fennec_DOS-Shim/Android.mk
deleted file mode 100644
index 9a572af8..00000000
--- a/Patches/LineageOS-15.1/Fennec_DOS-Shim/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Install a shim for Fennec DOS
-# Once a user runs F-Droid for the first time, it'll update and install the real Fennec DOS
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := FennecDOS
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_TARGET_ARCH := arm
-
-LOCAL_OVERRIDES_PACKAGES := Jelly
-
-LOCAL_SRC_FILES := prebuilt/Fennec_DOS-Shim.apk
-
-include $(BUILD_PREBUILT)
diff --git a/Patches/LineageOS-15.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk b/Patches/LineageOS-15.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk
deleted file mode 100644
index c92ca95b..00000000
Binary files a/Patches/LineageOS-15.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk and /dev/null differ
diff --git a/PrebuiltApps b/PrebuiltApps
index d5afaad2..4d6c402a 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit d5afaad25c6fdd4f06d679fba7b7c955b2a5cf73
+Subproject commit 4d6c402ab3da71e0b007706aef51a6657374dfd3
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index b978bc5c..4cdc6eb4 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -55,7 +55,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a
 #
 
 #top dir
-cp -r $patches"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK
+cp -r $prebuiltApps"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK
 cp -r $prebuiltApps"android_vendor_FDroid_PrebuiltApps" $base"vendor/fdroid_prebuilt"; #Add the prebuilt apps
 
 enterAndClear "bootable/recovery"
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 862137d3..24220a51 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -55,7 +55,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a
 #
 
 #top dir
-cp -r $patches"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK
+cp -r $prebuiltApps"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK
 cp -r $prebuiltApps"android_vendor_FDroid_PrebuiltApps" $base"vendor/fdroid_prebuilt"; #Add the prebuilt apps
 
 #enterAndClear "bootable/recovery"