diff --git a/betterbug/betterbug.mk b/betterbug/betterbug.mk
deleted file mode 100644
index f3ae647..0000000
--- a/betterbug/betterbug.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-PRODUCT_PACKAGES += BetterBugStub
-PRODUCT_PACKAGES_DEBUG += BetterBug
-
-PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/public
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/private
diff --git a/betterbug/sepolicy/product/private/better_bug_app.te b/betterbug/sepolicy/product/private/better_bug_app.te
deleted file mode 100644
index bb50612..0000000
--- a/betterbug/sepolicy/product/private/better_bug_app.te
+++ /dev/null
@@ -1,15 +0,0 @@
-typeattribute better_bug_app coredomain;
-
-app_domain(better_bug_app)
-net_domain(better_bug_app)
-
-allow better_bug_app shell_data_file:file read;
-allow better_bug_app privapp_data_file:file execute;
-
-allow better_bug_app app_api_service:service_manager find;
-allow better_bug_app system_api_service:service_manager find;
-allow better_bug_app mediaserver_service:service_manager find;
-
-set_prop(better_bug_app, ctl_start_prop)
-
-get_prop(better_bug_app, system_boot_reason_prop)
diff --git a/betterbug/sepolicy/product/private/seapp_contexts b/betterbug/sepolicy/product/private/seapp_contexts
deleted file mode 100644
index 261e710..0000000
--- a/betterbug/sepolicy/product/private/seapp_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-# BetterBug
-user=_app isPrivApp=true name=com.google.android.apps.internal.betterbug domain=better_bug_app type=app_data_file levelFrom=all
diff --git a/betterbug/sepolicy/product/public/better_bug_app.te b/betterbug/sepolicy/product/public/better_bug_app.te
deleted file mode 100644
index 9a14782..0000000
--- a/betterbug/sepolicy/product/public/better_bug_app.te
+++ /dev/null
@@ -1 +0,0 @@
-type better_bug_app, domain;
diff --git a/gyotaku_app/gyotaku.mk b/gyotaku_app/gyotaku.mk
index c6c41d5..8a6bb10 100644
--- a/gyotaku_app/gyotaku.mk
+++ b/gyotaku_app/gyotaku.mk
@@ -6,7 +6,7 @@ ifneq ($(TARGET_BUILD_VARIANT), user)
       BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/
 
       # Pixel 5a (barbet) does not support Pixel dump
-      ifneq ($(TARGET_PRODUCT), barbet)
+      ifeq (,$(filter barbet%,$(TARGET_PRODUCT)))
         PRODUCT_PACKAGES_DEBUG += dump_gyotaku
         BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/dump
       endif