diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 9335517..6d2ddf8 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -14,12 +14,6 @@
 # limitations under the License.
 #
 
-ifdef PHONE_CAR_BOARD_PRODUCT
-    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
-else
-    TARGET_SCREEN_DENSITY := 420
-endif
-
 # Enable load module in parallel
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
@@ -32,14 +26,12 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 
 TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := bluejay
-USES_DEVICE_GOOGLE_BLUEJAY := true
+TARGET_SCREEN_DENSITY := 420
+
 BOARD_KERNEL_CMDLINE += disable_dma32=on
 
 include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
-include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-
-$(call soong_config_set,google3a_config,target_device,bluejay)
 
 DEVICE_PATH := device/google/bluejay
 VENDOR_PATH := vendor/google/bluejay
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 316d129..d14ebd9 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -27,11 +27,6 @@ include device/google/gs101/device-shipping-common.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm11.mk
 
-# go/lyric-soong-variables
-$(call soong_config_set,lyric,camera_hardware,bluejay)
-$(call soong_config_set,lyric,tuning_product,bluejay)
-$(call soong_config_set,google3a_config,target_device,bluejay)
-
 # Init files
 PRODUCT_COPY_FILES += \
 	device/google/bluejay/conf/init.blueport.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.blueport.rc \
@@ -84,9 +79,6 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayBluejay
 
-# Shared Modem Platform
-SHARED_MODEM_PLATFORM_VENDOR := lassen
-
 # Shared Modem Platform
 include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
 
@@ -194,21 +186,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode=true
 
 # GPS xml
-ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
-    PRODUCT_COPY_FILES += \
-        device/google/bluejay/gps_user.6.1.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-else
-    PRODUCT_COPY_FILES += \
-        device/google/bluejay/gps_user.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-endif
+PRODUCT_COPY_FILES += \
+    device/google/bluejay/gps_user.6.1.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 
 # This device is shipped with 32 (Android S V2)
 PRODUCT_SHIPPING_API_LEVEL := 32
 
 # Vibrator HAL
-$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
-ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
-ACTUATOR_MODEL := legacy_zlra_actuator
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.vendor.vibrator.hal.f0.comp.enabled=0 \
 	ro.vendor.vibrator.hal.redc.comp.enabled=0 \