diff --git a/grbl/grbl_motion_control.c b/grbl/grbl_motion_control.c
index f9a33b8..65190c2 100644
--- a/grbl/grbl_motion_control.c
+++ b/grbl/grbl_motion_control.c
@@ -30,7 +30,7 @@
 // in the planner and to let backlash compensation or canned cycle integration simple and direct.
 void mc_line(float *target, plan_line_data_t *pl_data)
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   // If enabled, check for soft limit violations. Placed here all line motions are picked up
   // from everywhere in Grbl.
@@ -88,7 +88,7 @@ void mc_line(float *target, plan_line_data_t *pl_data)
 void mc_arc(float *target, plan_line_data_t *pl_data, float *position, float *offset, float radius,
   uint8_t axis_0, uint8_t axis_1, uint8_t axis_linear, uint8_t is_clockwise_arc)
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   float center_axis0 = position[axis_0] + offset[axis_0];
   float center_axis1 = position[axis_1] + offset[axis_1];
@@ -197,7 +197,7 @@ void mc_arc(float *target, plan_line_data_t *pl_data, float *position, float *of
 // Execute dwell in seconds.
 void mc_dwell(float seconds)
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   if (sys.state == STATE_CHECK_MODE) { return; }
   protocol_buffer_synchronize();
@@ -333,7 +333,7 @@ uint8_t mc_probe_cycle(float *target, plan_line_data_t *pl_data, uint8_t parser_
 #ifdef PARKING_ENABLE
   void mc_parking_motion(float *parking_target, plan_line_data_t *pl_data)
   {
-    PRINTF_DEBUG("");
+    //PRINTF_DEBUG("");
 
     if (sys.abort) { return; } // Block during abort.
 
@@ -362,7 +362,7 @@ uint8_t mc_probe_cycle(float *target, plan_line_data_t *pl_data, uint8_t parser_
 #ifdef ENABLE_PARKING_OVERRIDE_CONTROL
   void mc_override_ctrl_update(uint8_t override_state)
   {
-    PRINTF_DEBUG("");
+    //PRINTF_DEBUG("");
 
     // Finish all queued commands before altering override control state
     protocol_buffer_synchronize();
@@ -379,7 +379,7 @@ uint8_t mc_probe_cycle(float *target, plan_line_data_t *pl_data, uint8_t parser_
 // realtime abort command and hard limits. So, keep to a minimum.
 void mc_reset()
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   // Only this function can set the system reset. Helps prevent multiple kill calls.
   if (bit_isfalse(sys_rt_exec_state, EXEC_RESET)) {
diff --git a/grbl/grbl_stepper.c b/grbl/grbl_stepper.c
index 0c25a6d..f9c71e1 100644
--- a/grbl/grbl_stepper.c
+++ b/grbl/grbl_stepper.c
@@ -225,7 +225,7 @@ static st_prep_t prep;
 void st_wake_up()
 {
 
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
   // Enable stepper drivers.
   //if (bit_istrue(settings.flags,BITFLAG_INVERT_ST_ENABLE)) { STEPPERS_DISABLE_PORT |= (1<<STEPPERS_DISABLE_BIT); }
   //else { STEPPERS_DISABLE_PORT &= ~(1<<STEPPERS_DISABLE_BIT); }
@@ -256,7 +256,7 @@ void st_wake_up()
 // Stepper shutdown
 void st_go_idle()
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   stepperInterruptEnable = 0;
 
@@ -551,7 +551,7 @@ double ecmc_grbl_main_rt_thread()
 // Generates the step and direction port invert masks used in the Stepper Interrupt Driver.
 void st_generate_step_dir_invert_masks()
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   uint8_t idx;
   step_port_invert_mask = 0;
@@ -573,7 +573,7 @@ void st_generate_step_dir_invert_masks()
 // Reset and clear stepper subsystem variables
 void st_reset()
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   // Initialize stepper driver idle state.
   st_go_idle();
@@ -606,7 +606,7 @@ void st_reset()
 // Initialize and start the stepper motor subsystem
 void stepper_init()
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   // Configure step and direction interface pins
 //  STEP_DDR |= STEP_MASK;
@@ -640,7 +640,7 @@ void stepper_init()
 // Called by planner_recalculate() when the executing block is updated by the new plan.
 void st_update_plan_block_parameters()
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   if (pl_block != NULL) { // Ignore if at start of a new block.
     prep.recalculate_flag |= PREP_FLAG_RECALCULATE;
@@ -653,7 +653,7 @@ void st_update_plan_block_parameters()
 // Increments the step segment buffer block data ring buffer.
 static uint8_t st_next_block_index(uint8_t block_index)
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   block_index++;
   if ( block_index == (SEGMENT_BUFFER_SIZE-1) ) { return(0); }
@@ -1144,7 +1144,7 @@ void st_prep_buffer()
 // divided by the ACCELERATION TICKS PER SECOND in seconds.
 float st_get_realtime_rate()
 {
-  PRINTF_DEBUG("");
+  //PRINTF_DEBUG("");
 
   if (sys.state & (STATE_CYCLE | STATE_HOMING | STATE_HOLD | STATE_JOG | STATE_SAFETY_DOOR)){
     return prep.current_speed;
diff --git a/grbl/grbl_system.c b/grbl/grbl_system.c
index 8fa4753..1b7b9fe 100644
--- a/grbl/grbl_system.c
+++ b/grbl/grbl_system.c
@@ -23,7 +23,7 @@
 
 void system_init()
 {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
 
   //CONTROL_DDR &= ~(CONTROL_MASK); // Configure as input pins
   //#ifdef DISABLE_CONTROL_PIN_PULL_UP
@@ -41,7 +41,7 @@ void system_init()
 // defined by the CONTROL_PIN_INDEX in the header file.
 uint8_t system_control_get_state()
 {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   return 0;
 //  uint8_t control_state = 0;
 //  uint8_t pin = (CONTROL_PIN & CONTROL_MASK) ^ CONTROL_MASK;
@@ -90,7 +90,7 @@ uint8_t system_control_get_state()
 // Returns if safety door is ajar(T) or closed(F), based on pin state.
 uint8_t system_check_safety_door_ajar()
 {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   return 0;
 
   //#ifdef ENABLE_SAFETY_DOOR_INPUT_PIN
@@ -104,7 +104,7 @@ uint8_t system_check_safety_door_ajar()
 // Executes user startup script, if stored.
 void system_execute_startup(char *line)
 {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   uint8_t n;
   for (n=0; n < N_STARTUP_LINE; n++) {
     if (!(settings_read_startup_line(n, line))) {
@@ -130,14 +130,12 @@ void system_execute_startup(char *line)
 // be an issue, since these commands are not typically used during a cycle.
 
 uint8_t system_execute_line(char *line)
-{
-  printf("\n%s:%s:%d:###################\n",__FILE__,__FUNCTION__,__LINE__);
-  printf("%s:%s:%d:%s\n",__FILE__,__FUNCTION__,__LINE__,line);
+{  
+  //printf("%s:%s:%d:%s\n",__FILE__,__FUNCTION__,__LINE__,line);
 
   uint8_t char_counter = 1;
   uint8_t helper_var = 0; // Helper variable
-  float parameter, value;
-  printf("system_execute_line switch line[1]=%c\n",line[char_counter]);
+  float parameter, value;  
   switch( line[char_counter] ) {
     case 0 : report_grbl_help(); break;
     case 'J' : // Jogging
@@ -263,11 +261,8 @@ uint8_t system_execute_line(char *line)
             // No break. Continues into default: to read remaining command characters.
           }
         default :  // Storing setting methods [IDLE/ALARM]
-          printf("1\n");
           if(!read_float(line, &char_counter, &parameter)) { return(STATUS_BAD_NUMBER_FORMAT); }
-          printf("2 parameter %f\n",parameter);
           if(line[char_counter++] != '=') { return(STATUS_INVALID_STATEMENT); }
-          printf("3\n");
           if (helper_var) { // Store startup line
             // Prepare sending gcode block to gcode parser by shifting all characters
             helper_var = char_counter; // Set helper variable as counter to start of gcode block
@@ -389,7 +384,7 @@ void system_clear_exec_state_flag(uint8_t mask) {
 }
 
 void system_set_exec_alarm(uint8_t code) {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   //uint8_t sreg = SREG;
   //cli();
   sys_rt_exec_alarm = code;
@@ -397,7 +392,7 @@ void system_set_exec_alarm(uint8_t code) {
 }
 
 void system_clear_exec_alarm() {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   //uint8_t sreg = SREG;
   //cli();
   sys_rt_exec_alarm = 0;
@@ -405,7 +400,7 @@ void system_clear_exec_alarm() {
 }
 
 void system_set_exec_motion_override_flag(uint8_t mask) {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   //uint8_t sreg = SREG;
   //cli();
   sys_rt_exec_motion_override |= (mask);
@@ -413,7 +408,7 @@ void system_set_exec_motion_override_flag(uint8_t mask) {
 }
 
 void system_set_exec_accessory_override_flag(uint8_t mask) {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   //uint8_t sreg = SREG;
   //cli();
   sys_rt_exec_accessory_override |= (mask);
@@ -421,7 +416,7 @@ void system_set_exec_accessory_override_flag(uint8_t mask) {
 }
 
 void system_clear_exec_motion_overrides() {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   //uint8_t sreg = SREG;
   //cli();
   sys_rt_exec_motion_override = 0;
@@ -429,7 +424,7 @@ void system_clear_exec_motion_overrides() {
 }
 
 void system_clear_exec_accessory_overrides() {
-  printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
+  //printf("%s:%s:%d:\n",__FILE__,__FUNCTION__,__LINE__);
   //uint8_t sreg = SREG;
   //cli();
   sys_rt_exec_accessory_override = 0;