diff --git a/device.mk b/device.mk
index 8585b6ae..0246ff0f 100644
--- a/device.mk
+++ b/device.mk
@@ -51,8 +51,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/interfaces \
 	vendor/google_devices/common/proprietary/confirmatioui_hal \
 	vendor/google_nos/host/android \
-	vendor/google_nos/test/system-test-harness \
-	vendor/google/camera
+	vendor/google_nos/test/system-test-harness
 
 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 
@@ -501,14 +500,14 @@ $(call soong_config_set,google3a_config,soc,zuma)
 $(call soong_config_set,google3a_config,gcam_awb,true)
 $(call soong_config_set,google3a_config,ghawb_truetone,true)
 
-ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
-$(call soong_config_set,lyric,soc,zuma)
-$(call soong_config_set,lyric,use_lyric_camera_hal,true)
+# ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
+# $(call soong_config_set,lyric,soc,zuma)
+# $(call soong_config_set,lyric,use_lyric_camera_hal,true)
 # lyric::tuning_product is set in device-specific makefiles,
 # such as device/google/${DEVICE}/device-${DEVICE}.mk
 
-$(call soong_config_set,gch,hwl_library,lyric)
-endif
+# $(call soong_config_set,gch,hwl_library,lyric)
+# endif
 
 # WiFi
 PRODUCT_PACKAGES += \