diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
index 84d2bf20db..f9cd030d46 100644
--- a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
@@ -7,14 +7,6 @@
 #define MICROPY_HW_USB_VID (0x239A)
 #define MICROPY_HW_USB_PID (0x80F2)
 
-// STEMMA QT / Qwiic on I2C1
-#define MICROPY_HW_I2C1_SCL  (3)
-#define MICROPY_HW_I2C1_SDA  (2)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (20)
-
 // NeoPixel GPIO16, power not toggleable
 
 // Red user LED GPIO13
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
index 8f5551172b..be950f4f99 100644
--- a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
@@ -7,13 +7,6 @@
 #define MICROPY_HW_USB_VID (0x239A)
 #define MICROPY_HW_USB_PID (0x80FE)
 
-#define MICROPY_HW_I2C0_SCL  (3)
-#define MICROPY_HW_I2C0_SDA  (2)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (20)
-
 // NeoPixel data GPIO17, power GPIO16
 
 // Red user LED GPIO11
diff --git a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
index ca341cedd8..6d834fd4f5 100644
--- a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
@@ -12,17 +12,10 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (7)
 
-#define MICROPY_HW_I2C0_SCL  (25)
-#define MICROPY_HW_I2C0_SDA  (24)
-
-// STEMMA QT / Qwiic on I2C1
+// STEMMA QT / Qwiic on (non-default) I2C1
 #define MICROPY_HW_I2C1_SCL  (23)
 #define MICROPY_HW_I2C1_SDA  (22)
 
-#define MICROPY_HW_SPI0_SCK  (6)
-#define MICROPY_HW_SPI0_MOSI (3)
-#define MICROPY_HW_SPI0_MISO (4)
-
 // NeoPixel data GPIO12, power GPIO11
 
 // Boot button GPIO21
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 87b9187659..5ea9b8cdb8 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -22,16 +22,12 @@
 #define MICROPY_HW_UART1_CTS            (10)
 #define MICROPY_HW_UART1_RTS            (11)
 
-// SPI 1 config.
+// SPI 1 config (non-default).
 #define MICROPY_HW_SPI1_SCK             (14)
 #define MICROPY_HW_SPI1_MOSI            (11)
 #define MICROPY_HW_SPI1_MISO            (8)
 
-// I2C0 config.
-#define MICROPY_HW_I2C0_SCL             (13)
-#define MICROPY_HW_I2C0_SDA             (12)
-
-// I2C1 config.
+// I2C1 config (non-default).
 #define MICROPY_HW_I2C1_SCL             (27)
 #define MICROPY_HW_I2C1_SDA             (26)
 
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
index 134c2ff784..a90ef6783d 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
@@ -11,14 +11,6 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (11)
 
-// Qwiic on I2C0
-#define MICROPY_HW_I2C0_SCL  (4)
-#define MICROPY_HW_I2C0_SDA  (5)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (16)
-
 // User LED GPIO25
 
 // VBUS_SENSE GPIO24
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
index fd45547e1b..53ade72915 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
@@ -11,14 +11,6 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (11)
 
-// Qwiic on I2C0
-#define MICROPY_HW_I2C0_SCL  (4)
-#define MICROPY_HW_I2C0_SDA  (5)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (16)
-
 // User LED GPIO25
 
 // VBUS_SENSE GPIO24
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
index 50cb2bd599..ea40a8071b 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_HW_USB_VID (0x16D0)
 #define MICROPY_HW_USB_PID (0x08C7)
 
+// I2C0 (non-default)
 #define MICROPY_HW_I2C0_SCL  (4)
 #define MICROPY_HW_I2C0_SDA  (5)
 
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
index 65b29eecd1..72a9aeb373 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
@@ -11,12 +11,4 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (11)
 
-// Qwiic on I2C0
-#define MICROPY_HW_I2C0_SCL  (17)
-#define MICROPY_HW_I2C0_SDA  (16)
-
-#define MICROPY_HW_SPI0_SCK  (22)
-#define MICROPY_HW_SPI0_MOSI (23)
-#define MICROPY_HW_SPI0_MISO (20)
-
 // NeoPixel data GPIO25, power not toggleable
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
index f88ba5dd63..c2ca90b968 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
@@ -9,15 +9,7 @@
 #define MICROPY_HW_I2C0_SCL  (17)
 #define MICROPY_HW_I2C0_SDA  (16)
 
-// Qwiic on I2C1
-#define MICROPY_HW_I2C1_SCL  (7)
-#define MICROPY_HW_I2C1_SDA  (6)
-
-#define MICROPY_HW_SPI0_SCK  (2)
-#define MICROPY_HW_SPI0_MOSI (3)
-#define MICROPY_HW_SPI0_MISO (4)
-
-// MicroSD on SPI1
+// MicroSD on SPI1 (non-default)
 #define MICROPY_HW_SPI1_SCK  (14)
 #define MICROPY_HW_SPI1_MOSI (15)
 #define MICROPY_HW_SPI1_MISO (12)