diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 6a5c5f0da..bf445ebcc 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -792,13 +792,6 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_ms = 1000;
     moduleConfig.external_notification.nag_timeout = 60;
 #endif
-#ifdef BUTTON_SECONDARY_CANNEDMESSAGES
-    // Use a board's second built-in button as input source for canned messages
-    moduleConfig.canned_message.enabled = true;
-    moduleConfig.canned_message.inputbroker_pin_press = BUTTON_PIN_SECONDARY;
-    strcpy(moduleConfig.canned_message.allow_input_source, "scanAndSelect");
-#endif
-
     moduleConfig.has_canned_message = true;
     moduleConfig.canned_message.enabled = true;
 #if USERPREFS_MQTT_ENABLED && !MESHTASTIC_EXCLUDE_MQTT
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index a6380d367..678a7e988 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -174,17 +174,18 @@ void setupModules()
                 delete upDownInterruptImpl1;
                 upDownInterruptImpl1 = nullptr;
             }
-
-#if HAS_SCREEN
-            // In order to have the user button dismiss the canned message frame, this class lightly interacts with the Screen
-            // class
-            scanAndSelectInput = new ScanAndSelectInput();
-            if (!scanAndSelectInput->init()) {
-                delete scanAndSelectInput;
-                scanAndSelectInput = nullptr;
-            }
-#endif
-
+            /*
+            #if HAS_SCREEN
+                        // In order to have the user button dismiss the canned message frame, this class lightly interacts with
+            the Screen
+                        // class
+                        scanAndSelectInput = new ScanAndSelectInput();
+                        if (!scanAndSelectInput->init()) {
+                            delete scanAndSelectInput;
+                            scanAndSelectInput = nullptr;
+                        }
+            #endif
+            */
             cardKbI2cImpl = new CardKbI2cImpl();
             cardKbI2cImpl->init();
 #ifdef INPUTBROKER_MATRIX_TYPE
diff --git a/variants/heltec_vision_master_e213/variant.h b/variants/heltec_vision_master_e213/variant.h
index ebb2c341f..a88bc0b45 100644
--- a/variants/heltec_vision_master_e213/variant.h
+++ b/variants/heltec_vision_master_e213/variant.h
@@ -1,7 +1,7 @@
 #define LED_PIN 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
-#define BUTTON_PIN_SECONDARY 21         // Second built-in button
-#define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input
+#define BUTTON_PIN_SECONDARY 21    // Second built-in button
+#define TB_UP BUTTON_PIN_SECONDARY // Send the up event
 
 // I2C
 #define I2C_SDA SDA
diff --git a/variants/heltec_vision_master_e290/variant.h b/variants/heltec_vision_master_e290/variant.h
index 02986d26b..0d85ecee0 100644
--- a/variants/heltec_vision_master_e290/variant.h
+++ b/variants/heltec_vision_master_e290/variant.h
@@ -1,7 +1,7 @@
 #define LED_PIN 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
-#define BUTTON_PIN_SECONDARY 21         // Second built-in button
-#define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input
+#define BUTTON_PIN_SECONDARY 21    // Second built-in button
+#define TB_UP BUTTON_PIN_SECONDARY // Send the up event
 
 // I2C
 #define I2C_SDA SDA
diff --git a/variants/heltec_vision_master_t190/variant.h b/variants/heltec_vision_master_t190/variant.h
index 3814d8a01..bcdef1db4 100644
--- a/variants/heltec_vision_master_t190/variant.h
+++ b/variants/heltec_vision_master_t190/variant.h
@@ -1,7 +1,7 @@
 #ifndef HAS_TFT
 #define BUTTON_PIN 0
-#define BUTTON_PIN_SECONDARY 21         // Second built-in button
-#define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input
+#define BUTTON_PIN_SECONDARY 21    // Second built-in button
+#define TB_UP BUTTON_PIN_SECONDARY // Send the up event
 
 // I2C
 #define I2C_SDA SDA