diff --git a/0001-Remove-fsck-SELinux-labels.patch b/0001-Remove-fsck-SELinux-labels.patch
index d07bef0..72d7935 100644
--- a/0001-Remove-fsck-SELinux-labels.patch
+++ b/0001-Remove-fsck-SELinux-labels.patch
@@ -1,4 +1,4 @@
-From d922de7e988db91e16f0d9c15b5589026e7bc11c Mon Sep 17 00:00:00 2001
+From 3fb27b3b3ab30a86432d2ca1f8fe5c3802793866 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 23 Oct 2019 09:38:16 +0000
 Subject: [PATCH] Remove fsck SELinux labels
@@ -11,11 +11,11 @@ Change-Id: I7c63c9aed39afc07b8c80918053154113f848cd9
  1 file changed, 3 deletions(-)
 
 diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
-index 1160738..a29bd32 100644
+index 6da14ac..dfea075 100644
 --- a/sepolicy/file_contexts
 +++ b/sepolicy/file_contexts
-@@ -5,8 +5,5 @@
- /system/bin/phh-on-boot.sh u:object_r:phhsu_exec:s0
+@@ -6,9 +6,6 @@
+ /system/bin/phh-on-data.sh u:object_r:phhsu_exec:s0
  /system/bin/asus-motor u:object_r:phhsu_exec:s0
  
 -#/system/bin/fsck\.exfat                 u:object_r:fsck_exec:s0
@@ -23,6 +23,7 @@ index 1160738..a29bd32 100644
 -
  /bt_firmware(/.*)?      u:object_r:bt_firmware_file:s0
  
+ /sec_storage(/.*)?      u:object_r:teecd_data_file:s0
 -- 
 2.17.1
 
diff --git a/0001-Squashed-revert-of-LOS-FOD-implementation.patch b/0001-Squashed-revert-of-LOS-FOD-implementation.patch
index eabd5a2..76c4ae3 100644
--- a/0001-Squashed-revert-of-LOS-FOD-implementation.patch
+++ b/0001-Squashed-revert-of-LOS-FOD-implementation.patch
@@ -1,4 +1,4 @@
-From 1880d0b34d9300895315c23e6742e0476fe0b5c9 Mon Sep 17 00:00:00 2001
+From 16b05029ca5f14a5c881eccfc57f07738fc64d8a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 5 Feb 2020 02:24:44 +0000
 Subject: [PATCH] Squashed revert of LOS FOD implementation
@@ -13,14 +13,14 @@ Change-Id: Ifbcd5ff44c97e536fd2e417deadc2b08773b7b5e
  .../res/drawable/fod_icon_default.xml         |  25 -
  packages/SystemUI/res/values/config.xml       |   1 -
  .../SystemUI/res/values/lineage_config.xml    |   4 -
- .../systemui/biometrics/FODCircleView.java    | 428 ------------------
+ .../systemui/biometrics/FODCircleView.java    | 430 ------------------
  .../biometrics/FODCircleViewImpl.java         |  62 ---
  .../systemui/statusbar/CommandQueue.java      |  28 --
  services/core/Android.bp                      |   1 -
  .../biometrics/BiometricServiceBase.java      |   2 +-
  .../fingerprint/FingerprintService.java       | 112 -----
  .../statusbar/StatusBarManagerService.java    |  22 -
- 13 files changed, 1 insertion(+), 692 deletions(-)
+ 13 files changed, 1 insertion(+), 694 deletions(-)
  delete mode 100644 packages/SystemUI/res/drawable/fod_icon_default.xml
  delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
  delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java
@@ -133,10 +133,10 @@ index fd732a7127a..e520306aa78 100644
      <integer name="config_maxVisibleNotificationIconsOnLock">5</integer>
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
 deleted file mode 100644
-index 782805cdccf..00000000000
+index 0af62b731b9..00000000000
 --- a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
 +++ /dev/null
-@@ -1,428 +0,0 @@
+@@ -1,430 +0,0 @@
 -/**
 - * Copyright (C) 2019 The Android Open Source Project
 - *
@@ -460,6 +460,8 @@ index 782805cdccf..00000000000
 -
 -        mIsShowing = true;
 -
+-        updatePosition();
+-
 -        dispatchShow();
 -        setVisibility(View.VISIBLE);
 -    }
diff --git a/buildbot_treble_vanilla.sh b/buildbot_treble_vanilla.sh
index f4d369e..3687e27 100644
--- a/buildbot_treble_vanilla.sh
+++ b/buildbot_treble_vanilla.sh
@@ -17,10 +17,6 @@ echo "Setting up build environment"
 source build/envsetup.sh &> /dev/null
 echo ""
 
-echo "Picking temporary stuff"
-repopick -t ten-vold
-echo ""
-
 #read -p "Press any key to start building, or CTRL-C to exit" nothing
 
 echo "Applying universal patches"
@@ -72,6 +68,6 @@ make WITHOUT_CHECK_API=true installclean
 make WITHOUT_CHECK_API=true systemimage
 make WITHOUT_CHECK_API=true vndk-test-sepolicy
 BUILD_DATE=`date +%Y%m%d`
-mv $OUT/system.img ~/build-output/lineage-17.0-$BUILD_DATE-UNOFFICIAL-treble_arm64_avN.img
+mv $OUT/system.img ~/build-output/lineage-17.1-$BUILD_DATE-UNOFFICIAL-treble_arm64_avN.img
 cat $OUT/system/build.prop | grep security_patch
 echo ""
diff --git a/roomservice.xml b/roomservice.xml
index ac6f1ae..69486a9 100644
--- a/roomservice.xml
+++ b/roomservice.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <project name="LineageOS/android_packages_apps_Profiles" path="packages/apps/Profiles" />
-  <project name="LineageOS/android_packages_resources_devicesettings" path="packages/resources/devicesettings" remote="github" />
   <project name="phhusson/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
   <project name="phhusson/device_phh_treble" path="device/phh/treble" remote="github" revision="android-10.0" />
   <project name="phhusson/vendor_vndk" path="vendor/vndk" remote="github" revision="android-10.0" />