diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c
index 7a0c0a759b..8e574527c1 100644
--- a/board/samus_pd/board.c
+++ b/board/samus_pd/board.c
@@ -263,7 +263,7 @@ static void board_init(void)
 	 */
 	if (system_get_image_copy() != SYSTEM_IMAGE_RW
 	    && system_is_locked()) {
-		ccprintf("[%T PD communication disabled]\n");
+		ccprintf("[%T PD comm disabled]\n");
 		pd_enable = 0;
 	} else {
 		pd_enable = 1;
diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h
index f647f14fac..a7c5a5e1bb 100644
--- a/board/samus_pd/board.h
+++ b/board/samus_pd/board.h
@@ -22,11 +22,13 @@
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGE_RAMP
 #undef  CONFIG_CMD_HASH
+#undef  CONFIG_CMD_HCDEBUG
 #undef  CONFIG_CMD_I2C_SCAN
 #undef  CONFIG_CMD_I2C_XFER
 /* Minimum ilim = 500 mA */
 #define CONFIG_CHARGER_INPUT_CURRENT PWM_0_MA
 #undef  CONFIG_CMD_IDLE_STATS
+#undef  CONFIG_CMD_MD
 #undef  CONFIG_CMD_SHMEM
 #undef  CONFIG_CMD_TIMERINFO
 #define CONFIG_COMMON_GPIO_SHORTNAMES
diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c
index 5c7889c41b..18b5ff8f20 100644
--- a/board/samus_pd/usb_pd_policy.c
+++ b/board/samus_pd/usb_pd_policy.c
@@ -191,7 +191,7 @@ int pd_custom_vdm(int port, int cnt, uint32_t *payload,
 	case VDO_CMD_VERSION:
 		/* guarantee last byte of payload is null character */
 		*(payload + cnt - 1) = 0;
-		CPRINTF("version: %s\n", (char *)(payload+1));
+		CPRINTF("ver: %s\n", (char *)(payload+1));
 		break;
 	case VDO_CMD_READ_INFO:
 	case VDO_CMD_SEND_INFO: