diff --git a/src/board/system76/addw2/gpio.c b/src/board/system76/addw2/gpio.c
index bc2ec21..a6dc2bc 100644
--- a/src/board/system76/addw2/gpio.c
+++ b/src/board/system76/addw2/gpio.c
@@ -105,8 +105,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EN
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    //
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/addw3/gpio.c b/src/board/system76/addw3/gpio.c
index 0bc16fe..27a0968 100644
--- a/src/board/system76/addw3/gpio.c
+++ b/src/board/system76/addw3/gpio.c
@@ -118,8 +118,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/addw4/gpio.c b/src/board/system76/addw4/gpio.c
index f5ea422..1029bad 100644
--- a/src/board/system76/addw4/gpio.c
+++ b/src/board/system76/addw4/gpio.c
@@ -105,8 +105,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_IN;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/bonw14/gpio.c b/src/board/system76/bonw14/gpio.c
index 2506088..03c61d1 100644
--- a/src/board/system76/bonw14/gpio.c
+++ b/src/board/system76/bonw14/gpio.c
@@ -97,8 +97,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // EC_EN
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // NO PIN
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // KBC_SMBus_CLK1
diff --git a/src/board/system76/bonw15/gpio.c b/src/board/system76/bonw15/gpio.c
index dce4969..b8b4c71 100644
--- a/src/board/system76/bonw15/gpio.c
+++ b/src/board/system76/bonw15/gpio.c
@@ -121,8 +121,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/darp7/gpio.c b/src/board/system76/darp7/gpio.c
index d4f84d1..2c46511 100644
--- a/src/board/system76/darp7/gpio.c
+++ b/src/board/system76/darp7/gpio.c
@@ -109,8 +109,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EN
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Does not exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/darp8/gpio.c b/src/board/system76/darp8/gpio.c
index f8d81b1..d6889dd 100644
--- a/src/board/system76/darp8/gpio.c
+++ b/src/board/system76/darp8/gpio.c
@@ -111,8 +111,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Does not exist
-    GPCRB7 = GPIO_IN | GPIO_DOWN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/darp9/gpio.c b/src/board/system76/darp9/gpio.c
index dce467e..6f52bfd 100644
--- a/src/board/system76/darp9/gpio.c
+++ b/src/board/system76/darp9/gpio.c
@@ -112,8 +112,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Missing
-    GPCRB7 = GPIO_IN | GPIO_DOWN;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/galp5/gpio.c b/src/board/system76/galp5/gpio.c
index 65eba23..880d562 100644
--- a/src/board/system76/galp5/gpio.c
+++ b/src/board/system76/galp5/gpio.c
@@ -110,8 +110,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // N/A
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/galp6/gpio.c b/src/board/system76/galp6/gpio.c
index d90056d..3cc5d62 100644
--- a/src/board/system76/galp6/gpio.c
+++ b/src/board/system76/galp6/gpio.c
@@ -114,8 +114,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_IN;
     // SUSBC_EC
     GPCRB6 = GPIO_OUT;
-    // Does not exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/gaze15/gpio.c b/src/board/system76/gaze15/gpio.c
index 69b89f5..4f456a5 100644
--- a/src/board/system76/gaze15/gpio.c
+++ b/src/board/system76/gaze15/gpio.c
@@ -100,8 +100,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // H_PROCHOT_EC
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    //
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/gaze16-3050/gpio.c b/src/board/system76/gaze16-3050/gpio.c
index 8d138b0..e454155 100644
--- a/src/board/system76/gaze16-3050/gpio.c
+++ b/src/board/system76/gaze16-3050/gpio.c
@@ -105,8 +105,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    //
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/gaze16-3060/gpio.c b/src/board/system76/gaze16-3060/gpio.c
index 7890be7..0991c71 100644
--- a/src/board/system76/gaze16-3060/gpio.c
+++ b/src/board/system76/gaze16-3060/gpio.c
@@ -105,8 +105,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Doesn't exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/gaze17-3050/gpio.c b/src/board/system76/gaze17-3050/gpio.c
index 3203b9d..bd737c7 100644
--- a/src/board/system76/gaze17-3050/gpio.c
+++ b/src/board/system76/gaze17-3050/gpio.c
@@ -103,8 +103,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/gaze17-3060/gpio.c b/src/board/system76/gaze17-3060/gpio.c
index dcbfeae..7345e13 100644
--- a/src/board/system76/gaze17-3060/gpio.c
+++ b/src/board/system76/gaze17-3060/gpio.c
@@ -109,8 +109,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_IN | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/gaze18/gpio.c b/src/board/system76/gaze18/gpio.c
index 6a3bd79..9267691 100644
--- a/src/board/system76/gaze18/gpio.c
+++ b/src/board/system76/gaze18/gpio.c
@@ -107,8 +107,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN | GPIO_UP;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/lemp10/gpio.c b/src/board/system76/lemp10/gpio.c
index dc1f7e4..b72504c 100644
--- a/src/board/system76/lemp10/gpio.c
+++ b/src/board/system76/lemp10/gpio.c
@@ -107,8 +107,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // EC_FORCE_POWER
     GPCRB6 = GPIO_IN;
-    // NC
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMB_CLK_EC
diff --git a/src/board/system76/lemp11/gpio.c b/src/board/system76/lemp11/gpio.c
index 99f743d..5cea0e9 100644
--- a/src/board/system76/lemp11/gpio.c
+++ b/src/board/system76/lemp11/gpio.c
@@ -114,8 +114,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Does not exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMB_CLK_EC
diff --git a/src/board/system76/lemp12/gpio.c b/src/board/system76/lemp12/gpio.c
index ed12968..543ba2b 100644
--- a/src/board/system76/lemp12/gpio.c
+++ b/src/board/system76/lemp12/gpio.c
@@ -113,8 +113,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Does not exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMB_CLK_EC
diff --git a/src/board/system76/lemp13/gpio.c b/src/board/system76/lemp13/gpio.c
index 3d0ba62..a69782b 100644
--- a/src/board/system76/lemp13/gpio.c
+++ b/src/board/system76/lemp13/gpio.c
@@ -108,8 +108,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_IN;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT;
-    // Does not exist
-    GPCRB7 = GPIO_IN;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/lemp9/gpio.c b/src/board/system76/lemp9/gpio.c
index bf54c84..80d9cb8 100644
--- a/src/board/system76/lemp9/gpio.c
+++ b/src/board/system76/lemp9/gpio.c
@@ -93,8 +93,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // NC
     GPCRB6 = GPIO_IN;
-    // NC
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMB_CLK_EC
diff --git a/src/board/system76/oryp11/gpio.c b/src/board/system76/oryp11/gpio.c
index ca562b3..34710e7 100644
--- a/src/board/system76/oryp11/gpio.c
+++ b/src/board/system76/oryp11/gpio.c
@@ -121,8 +121,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/oryp12/gpio.c b/src/board/system76/oryp12/gpio.c
index 235f745..f17a148 100644
--- a/src/board/system76/oryp12/gpio.c
+++ b/src/board/system76/oryp12/gpio.c
@@ -109,8 +109,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // NC
-    GPCRB7 = GPIO_IN;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/board/system76/oryp6/gpio.c b/src/board/system76/oryp6/gpio.c
index b1abe04..707289b 100644
--- a/src/board/system76/oryp6/gpio.c
+++ b/src/board/system76/oryp6/gpio.c
@@ -103,8 +103,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EN#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Does not exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/oryp7/gpio.c b/src/board/system76/oryp7/gpio.c
index a79f9d6..bef4ffd 100644
--- a/src/board/system76/oryp7/gpio.c
+++ b/src/board/system76/oryp7/gpio.c
@@ -102,8 +102,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EN#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Does not exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/oryp8/gpio.c b/src/board/system76/oryp8/gpio.c
index d12694a..894349e 100644
--- a/src/board/system76/oryp8/gpio.c
+++ b/src/board/system76/oryp8/gpio.c
@@ -105,8 +105,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Doesn't exist
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/oryp9/gpio.c b/src/board/system76/oryp9/gpio.c
index 6e0678a..6293c2f 100644
--- a/src/board/system76/oryp9/gpio.c
+++ b/src/board/system76/oryp9/gpio.c
@@ -114,8 +114,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT | GPIO_UP;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN;
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
     // SMC_VGA_THERM
diff --git a/src/board/system76/serw13/gpio.c b/src/board/system76/serw13/gpio.c
index fdf7f81..a05cff1 100644
--- a/src/board/system76/serw13/gpio.c
+++ b/src/board/system76/serw13/gpio.c
@@ -109,8 +109,6 @@ void gpio_init(void) {
     GPCRB5 = GPIO_OUT;
     // SUSBC_EC#
     GPCRB6 = GPIO_OUT | GPIO_UP;
-    // Not connected
-    GPCRB7 = GPIO_IN | GPIO_UP;
 
     // ALL_SYS_PWRGD
     GPCRC0 = GPIO_IN;
diff --git a/src/ec/ite/include/ec/gpio.h b/src/ec/ite/include/ec/gpio.h
index 8debc8d..112fd6d 100644
--- a/src/ec/ite/include/ec/gpio.h
+++ b/src/ec/ite/include/ec/gpio.h
@@ -118,7 +118,9 @@ volatile uint8_t __xdata __at(0x161B) GPCRB3;
 volatile uint8_t __xdata __at(0x161C) GPCRB4;
 volatile uint8_t __xdata __at(0x161D) GPCRB5;
 volatile uint8_t __xdata __at(0x161E) GPCRB6;
+#if CONFIG_EC_ITE_IT5571E || CONFIG_EC_ITE_IT8587E
 volatile uint8_t __xdata __at(0x161F) GPCRB7;
+#endif
 
 volatile uint8_t __xdata __at(0x1620) GPCRC0;
 volatile uint8_t __xdata __at(0x1621) GPCRC1;