diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 2a16ff9d46..e6386529ac 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -99,42 +99,27 @@ config CBFS_SIZE
 config EC_GOOGLE_CHROMEEC_BOARDNAME
 	string
 	depends on CHROMEOS
-	#default "gus" if BOARD_GOOGLE_VEYRON_GUS
 	#default "jaq" if BOARD_GOOGLE_VEYRON_JAQ
 	default "jerry" if BOARD_GOOGLE_VEYRON_JERRY
 	#default "mighty" if BOARD_GOOGLE_VEYRON_MIGHTY
 	#default "minnie" if BOARD_GOOGLE_VEYRON_MINNIE
-	#default "nicky" if BOARD_GOOGLE_VEYRON_NICKY
-	#default "pinky" if BOARD_GOOGLE_VEYRON_PINKY
-	#default "minnie" if BOARD_GOOGLE_VEYRON_SHARK
 	#default "speedy" if BOARD_GOOGLE_VEYRON_SPEEDY
-	#default "thea" if BOARD_GOOGLE_VEYRON_THEA
 
 config GBB_HWID
 	string
 	depends on CHROMEOS
-	default "GUS TEST A-A 2606" if BOARD_GOOGLE_VEYRON_GUS
 	default "JAQ TEST A-A 8292" if BOARD_GOOGLE_VEYRON_JAQ
 	default "JERRY TEST A-A 1250" if BOARD_GOOGLE_VEYRON_JERRY
 	default "MIGHTY TEST A-A 4557" if BOARD_GOOGLE_VEYRON_MIGHTY
 	default "MINNIE TEST A-A 5151" if BOARD_GOOGLE_VEYRON_MINNIE
-	default "NICKY TEST A-A 9039" if BOARD_GOOGLE_VEYRON_NICKY
-	default "PINKY TEST A-A 3693" if BOARD_GOOGLE_VEYRON_PINKY
-	default "SHARK TEST A-A 8553" if BOARD_GOOGLE_VEYRON_SHARK
 	default "SPEEDY TEST A-A 8421" if BOARD_GOOGLE_VEYRON_SPEEDY
-	default "THEA TEST A-A 7163" if BOARD_GOOGLE_VEYRON_THEA
 
 config CHROMEOS_FWID_MODEL
 	string
-	default "Google_Veyron_Gus" if BOARD_GOOGLE_VEYRON_GUS
 	default "Google_Veyron_Jaq" if BOARD_GOOGLE_VEYRON_JAQ
 	default "Google_Veyron_Jerry" if BOARD_GOOGLE_VEYRON_JERRY
 	default "Google_Veyron_Mighty" if BOARD_GOOGLE_VEYRON_MIGHTY
 	default "Google_Veyron_Minnie" if BOARD_GOOGLE_VEYRON_MINNIE
-	default "Google_Veyron_Nicky" if BOARD_GOOGLE_VEYRON_NICKY
-	default "Google_Veyron_Pinky" if BOARD_GOOGLE_VEYRON_PINKY
-	default "Google_Veyron_Shinky" if BOARD_GOOGLE_VEYRON_SHARK
 	default "Google_Veyron_Speedy" if BOARD_GOOGLE_VEYRON_SPEEDY
-	default "Google_Veyron_Thea" if BOARD_GOOGLE_VEYRON_THEA
 
 endif #  BOARD_GOOGLE_VEYRON
diff --git a/src/mainboard/google/veyron/Kconfig.name b/src/mainboard/google/veyron/Kconfig.name
index c5862939fc..efaa3f8df5 100644
--- a/src/mainboard/google/veyron/Kconfig.name
+++ b/src/mainboard/google/veyron/Kconfig.name
@@ -1,7 +1,3 @@
-config BOARD_GOOGLE_VEYRON_GUS
-	bool "Veyron_Gus"
-	select BOARD_GOOGLE_VEYRON
-
 config BOARD_GOOGLE_VEYRON_JAQ
 	bool "Haier Chromebook 11 (Veyron_Jaq)"
 	select BOARD_GOOGLE_VEYRON
@@ -22,23 +18,7 @@ config BOARD_GOOGLE_VEYRON_MINNIE
 	select BOARD_GOOGLE_VEYRON
 	select SYSTEM_TYPE_LAPTOP
 
-config BOARD_GOOGLE_VEYRON_NICKY
-	bool "Veyron_Nicky"
-	select BOARD_GOOGLE_VEYRON
-
-config BOARD_GOOGLE_VEYRON_PINKY
-	bool "Veyron_Pinky"
-	select BOARD_GOOGLE_VEYRON
-
-config BOARD_GOOGLE_VEYRON_SHARK
-	bool "Veyron_Shark"
-	select BOARD_GOOGLE_VEYRON
-
 config BOARD_GOOGLE_VEYRON_SPEEDY
 	bool "ASUS C201 Chromebook (Veyron_Speedy)"
 	select BOARD_GOOGLE_VEYRON
 	select SYSTEM_TYPE_LAPTOP
-
-config BOARD_GOOGLE_VEYRON_THEA
-	bool "Veyron_Thea"
-	select BOARD_GOOGLE_VEYRON