diff --git a/Firmware/Tcodes.cpp b/Firmware/Tcodes.cpp
index a78010aec..962cb60e9 100644
--- a/Firmware/Tcodes.cpp
+++ b/Firmware/Tcodes.cpp
@@ -4,7 +4,6 @@
 #include "language.h"
 #include "messages.h"
 #include "mmu2.h"
-#include "stepper.h"
 #include "ultralcd.h"
 #include <avr/pgmspace.h>
 #include <stdint.h>
@@ -20,18 +19,7 @@ inline void TCodeInvalid() {
     SERIAL_ECHOLNPGM("Invalid T code."); 
 }
 
-struct SChooseFromMenu {
-    uint8_t slot:7;
-    uint8_t loadToNozzle:1;
-    inline constexpr SChooseFromMenu(uint8_t slot, bool loadToNozzle):slot(slot), loadToNozzle(loadToNozzle){}
-    inline constexpr SChooseFromMenu():slot(0), loadToNozzle(false) { }
-};
-
-SChooseFromMenu TCodeChooseFromMenu() {
-    return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)), MMU2::mmu2.Enabled() );
-}
-
-void TCodes(char *const strchr_pointer, uint8_t codeValue) {
+void TCodes(char *const strchr_pointer, const uint8_t codeValue) {
     uint8_t index = 1;
     for ( /*nothing*/ ; strchr_pointer[index] == ' ' || strchr_pointer[index] == '\t'; index++)
         ;
@@ -40,7 +28,7 @@ void TCodes(char *const strchr_pointer, uint8_t codeValue) {
 
     if (IsInvalidTCode(strchr_pointer, index)){
         TCodeInvalid();
-    } else if (strchr_pointer[index] == 'x'){
+    } else if (strchr_pointer[index] == 'x' || strchr_pointer[index] == '?'){
         // load to extruder gears; if mmu is not present do nothing
         if (MMU2::mmu2.Enabled()) {
             MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)));
@@ -50,39 +38,24 @@ void TCodes(char *const strchr_pointer, uint8_t codeValue) {
         if (MMU2::mmu2.Enabled()) {
             MMU2::mmu2.tool_change(strchr_pointer[index], MMU2::mmu2.get_current_tool());
         }
-    } else {
-        SChooseFromMenu selectedSlot;
-        if (strchr_pointer[index] == '?') {
-            selectedSlot = TCodeChooseFromMenu();
-        /*} else if (MMU2::mmu2.Enabled() && SpoolJoin::spooljoin.isSpoolJoinEnabled()) {
-            // TODO: What if the next slot has no filament?
-            selectedSlot.slot = SpoolJoin::spooljoin.nextSlot();*/
-        } else {
-            selectedSlot.slot = codeValue;
-        }
-        st_synchronize();
-
+    } else { // Process T0 ... T4
         if (MMU2::mmu2.Enabled()) {
-            if (selectedSlot.slot == MMU2::mmu2.get_current_tool()){ 
+            if (codeValue == MMU2::mmu2.get_current_tool()){ 
                 // don't execute the same T-code twice in a row
                 puts_P(duplicate_Tcode_ignored);
             } else {
 #if defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT)
                 if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t *)EEPROM_MMU_CUTTER_ENABLED)) {
-                    MMU2::mmu2.cut_filament(selectedSlot.slot);
+                    MMU2::mmu2.cut_filament(codeValue);
                 }
 #endif // defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT)
-                if (selectedSlot.loadToNozzle){ // for single material usage with mmu
-                    MMU2::mmu2.load_filament_to_nozzle(selectedSlot.slot);
-                } else {
-                    MMU2::mmu2.tool_change(selectedSlot.slot);
-                }
+                MMU2::mmu2.tool_change(codeValue);
             }
         } else {
             SERIAL_ECHO_START;
-            if (selectedSlot.slot >= EXTRUDERS) {
+            if (codeValue >= EXTRUDERS) {
                 SERIAL_ECHO('T');
-                SERIAL_ECHOLN(selectedSlot.slot + '0');
+                SERIAL_ECHOLN(codeValue + '0');
                 SERIAL_ECHOLNRPGM(_n("Invalid extruder")); ////MSG_INVALID_EXTRUDER
             } else {
 // @@TODO               if (code_seen('F')) {
diff --git a/Firmware/Tcodes.h b/Firmware/Tcodes.h
index 684475780..5a464b986 100644
--- a/Firmware/Tcodes.h
+++ b/Firmware/Tcodes.h
@@ -2,4 +2,4 @@
 #pragma once
 #include <stdint.h>
 
-void TCodes(char * const strchr_pointer, uint8_t codeValue);
+void TCodes(char * const strchr_pointer, const uint8_t codeValue);