diff --git a/buildbot_unified.sh b/buildbot_unified.sh
index dacb2fd..09805c9 100755
--- a/buildbot_unified.sh
+++ b/buildbot_unified.sh
@@ -69,7 +69,6 @@ prep_build() {
repopick -Q "status:open+project:LineageOS/android_packages_apps_Etar+branch:lineage-19.0"
repopick -Q "status:open+project:LineageOS/android_packages_apps_Trebuchet+branch:lineage-19.0+NOT+317783+NOT+318747"
repopick -t twelve-burnin
- repopick -t twelve-FlipFlap
repopick -t twelve-buttons
repopick -t twelve-fingerprint
repopick -t twelve-volume-panel-location
@@ -78,17 +77,7 @@ prep_build() {
repopick -t twelve-navbar-runtime-toggle
repopick -t twelve-buttons-lights
repopick -t twelve-keyboard-lights
- repopick -t twelve-proximity-check
- repopick 320923 # SystemUI: Add quick settings pull down with one finger
- repopick -t twelve-dt2s
- repopick -t twelve-touchscreen-gestures
- repopick -t twelve-lights
- repopick -t twelve-visualizer
- repopick -t twelve-ls-media-art
- repopick -t twelve-long-screen
- repopick -t twelve-wake-on-plug
repopick -t twelve-statusbar-brightness-and-qs-slider
- repopick -t twelve-notification-sound-timeout
repopick -t twelve-powermenu
repopick 321337 # Deprioritize important developer notifications
repopick 321338 # Allow disabling important developer notifications
diff --git a/local_manifests_treble/manifest.xml b/local_manifests_treble/manifest.xml
index 5a7066c..86b0a9b 100644
--- a/local_manifests_treble/manifest.xml
+++ b/local_manifests_treble/manifest.xml
@@ -4,6 +4,7 @@
+