diff --git a/target/product/go_defaults.mk b/target/product/go_defaults.mk
index 2c86ae9e49..c9285307ab 100644
--- a/target/product/go_defaults.mk
+++ b/target/product/go_defaults.mk
@@ -20,9 +20,6 @@ $(call inherit-product, build/make/target/product/go_defaults_common.mk)
 # Product config map to toggle between sources and prebuilts of required mainline modules
 PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/build/release/gms_mainline_go/required/release_config_map.textproto)
 
-# TODO (b/342265627): Remove v/g/r once all the flags have been moved to v/g_s/b/r
-PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google/release/go_devices/release_config_map.textproto)
-
 # Add the system properties.
 TARGET_SYSTEM_PROP += \
     build/make/target/board/go_defaults.prop