diff --git a/src/callback.c b/src/callback.c
index bbd75c0f..aac70f13 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -2468,8 +2468,9 @@ static void handle_enter_notify(int draw_xhair, int crosshair_size)
 }
 
 static void handle_motion_notify(int event, KeySym key, int state, int rstate, int button,
-                                 int mx, int my, int aux, int draw_xhair, int enable_stretch, int snap_cursor, int wire_draw_active, char *str)
+                                 int mx, int my, int aux, int draw_xhair, int enable_stretch, int snap_cursor, int wire_draw_active)
 {
+    char str[PATH_MAX + 100];
     if( waves_selected(event, key, state, button)) {
       waves_callback(event, mx, my, key, button, aux, state);
       return;
@@ -2594,8 +2595,9 @@ static void handle_motion_notify(int event, KeySym key, int state, int rstate, i
 
 static void handle_key_press(int event, KeySym key, int state, int rstate, int mx, int my,
                              int button, int aux, int infix_interface, int enable_stretch, const char *win_path, double c_snap,
-                             int cadence_compat, int wire_draw_active, int snap_cursor, char *str)
+                             int cadence_compat, int wire_draw_active, int snap_cursor)
 {
+   char str[PATH_MAX + 100];
    if(key==' ') {
      if(xctx->ui_state & STARTWIRE) { /*  & instead of == 20190409 */
        new_wire(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap);
@@ -4349,8 +4351,9 @@ static void handle_button_press(int event, int state, int rstate, KeySym key, in
 }
 
 static void handle_button_release(int event, KeySym key, int state, int button, int mx, int my, 
-                                  int aux, double c_snap, int enable_stretch, int draw_xhair, int snap_cursor, int wire_draw_active, char *str)
+                                  int aux, double c_snap, int enable_stretch, int draw_xhair, int snap_cursor, int wire_draw_active)
 {
+   char str[PATH_MAX + 100];
    if(waves_selected(event, key, state, button)) {
      waves_callback(event, mx, my, key, button, aux, state);
      return;
@@ -4671,7 +4674,7 @@ int wire_draw_active = (xctx->ui_state & STARTWIRE) ||
   case MotionNotify:
     handle_motion_notify(event, key, state, rstate, button, mx, my,
                          aux, draw_xhair, enable_stretch, 
-                         snap_cursor, wire_draw_active, str);
+                         snap_cursor, wire_draw_active);
     break;
 
   case KeyRelease:
@@ -4680,7 +4683,7 @@ int wire_draw_active = (xctx->ui_state & STARTWIRE) ||
   case KeyPress:
     handle_key_press(event, key, state, rstate, mx, my, button, aux,
                      infix_interface, enable_stretch, win_path, c_snap,
-                     cadence_compat, wire_draw_active, snap_cursor, str);
+                     cadence_compat, wire_draw_active, snap_cursor);
     break;
 
   case ButtonPress:
@@ -4690,7 +4693,7 @@ int wire_draw_active = (xctx->ui_state & STARTWIRE) ||
 
   case ButtonRelease:
     handle_button_release(event, key, state, button, mx, my, aux, c_snap, enable_stretch,
-                          draw_xhair, snap_cursor, wire_draw_active, str);
+                          draw_xhair, snap_cursor, wire_draw_active);
     break;
    
   case -3:  /* double click  : edit prop */
diff --git a/src/xschemrc b/src/xschemrc
index fd5feedc..da44c178 100644
--- a/src/xschemrc
+++ b/src/xschemrc
@@ -226,12 +226,6 @@
 #### if not set show selected items at end of drag. Default: enabled (1)
 # set incremental_select 0
 
-#### if set to 1, pressing 'w', 'l', 'r', 'C', or 'Ctrl+C' will immediately place the
-#### corresponding component at current cursor position without waiting for Button1 (LMB) click. 
-#### This setting can be disabled via the Options menu
-#### default: 0
-# set infix_interface 1
-
 #### wires are drawn in free-form mode with this mode enabled (default).
 #### if set to 0, wires drawn on the schematic will no longer strictly
 #### follow orthogonal routes to connect two distinct points together.
@@ -294,15 +288,6 @@
 #### set cadence_compat; Default: 0 (Cadence-style keybinds are not used by default)
 # set cadence_compat 1
 
-#### enable drawing a diamond-shaped cursor at the closest circuit endpoint. Default: disabled (0)
-# set snap_cursor 1
-
-#### set snap_cursor_size; Default: 6 (Diamond-shaped cursor that snaps to nearest circuit endpoint)
-# set snap_cursor_size 6
-
-#### set cadence_compat; Default: 0 (Cadence-style keybinds are not used by default)
-# set cadence_compat 1
-
 #### if set, then, when cursor (regardless of style) is on an object, and user clicks (though mouse pointer is not on the object),
 #### the object is selected. Default: 0
 # set use_cursor_for_selection 1