diff --git a/src/mainboard/google/kahlee/bootblock/OemCustomize.c b/src/mainboard/google/kahlee/bootblock/OemCustomize.c
index 0aead6c67e..d980360360 100644
--- a/src/mainboard/google/kahlee/bootblock/OemCustomize.c
+++ b/src/mainboard/google/kahlee/bootblock/OemCustomize.c
@@ -104,32 +104,6 @@ static const PCIe_COMPLEX_DESCRIPTOR PcieComplex = {
 	.DdiLinkList  = DdiList
 };
 
-static const UINT32 AzaliaCodecAlc286Table[] = {
-	0x00172051, 0x001721C7, 0x00172222, 0x00172310,
-	0x0017FF00, 0x0017FF00, 0x0017FF00, 0x0017FF00,
-	0x01271C50, 0x01271D01, 0x01271EA6, 0x01271FB7,
-	0x01371C00, 0x01371D00, 0x01371E00, 0x01371F40,
-	0x01471C10, 0x01471D01, 0x01471E17, 0x01471F90,
-	0x01771CF0, 0x01771D11, 0x01771E11, 0x01771F41,
-	0x01871C40, 0x01871D10, 0x01871EA1, 0x01871F04,
-	0x01971CF0, 0x01971D11, 0x01971E11, 0x01971F41,
-	0x01A71CF0, 0x01A71D11, 0x01A71E11, 0x01A71F41,
-	0x01D71C2D, 0x01D71DA5, 0x01D71E67, 0x01D71F40,
-	0x01E71C30, 0x01E71D11, 0x01E71E45, 0x01E71F04,
-	0x02171C20, 0x02171D10, 0x02171E21, 0x02171F04,
-	0x02050071, 0x02040014, 0x02050010, 0x02040C22,
-	0x0205004F, 0x0204B029, 0x0205002B, 0x02040C50,
-	0x0205002D, 0x02041020, 0x02050020, 0x02040000,
-	0x02050019, 0x02040817, 0x02050035, 0x02041AA5,
-	0x02050063, 0x02042906, 0x02050063, 0x02042906,
-	0xffffffff
-};
-
-static CONST CODEC_VERB_TABLE_LIST CodecTableList[] = {
-	{ 0x10ec0286, AzaliaCodecAlc286Table},
-	{ 0x0FFFFFFFF, (void *)0x0FFFFFFFF}
-};
-
 /*---------------------------------------------------------------------------*/
 /**
  *  OemCustomizeInitEarly
@@ -149,6 +123,6 @@ static CONST CODEC_VERB_TABLE_LIST CodecTableList[] = {
 VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly)
 {
 	InitEarly->GnbConfig.PcieComplexList = &PcieComplex;
-	InitEarly->PlatformConfig.AzaliaCodecVerbTable =
-					(uint64_t)(uintptr_t)CodecTableList;
+	InitEarly->PlatformConfig.GnbAzI2sBusSelect = GnbAcpI2sBus;
+	InitEarly->PlatformConfig.GnbAzI2sBusPinConfig = GnbAcp2Tx4RxBluetooth;
 }