diff --git a/src/callback.c b/src/callback.c
index fc6cf28f..74654ed3 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -37,7 +37,7 @@ static int waves_selected(int event, KeySym key, int state, int button)
   rstate &= ~ShiftMask; /* don't use ShiftMask, identifying characters is sifficient */
   if(xctx->ui_state & excl) skip = 1;
   else if(sch_waves_loaded() < 0 ) skip = 1;
-  else if(key !='a' && SET_MODMASK) skip = 1;
+  else if(SET_MODMASK) skip = 1;
   else if(event == MotionNotify && (state & Button2Mask)) skip = 1;
   else if(event == MotionNotify && (state & Button1Mask) && (state & ShiftMask)) skip = 1;
   else if(event == ButtonPress && button == Button2) skip = 1;
@@ -459,13 +459,6 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
           tclvareval("graph_edit_properties ", my_itoa(i), NULL);
         }
       }
-      /* backannotate node values at cursor b position */
-      else if(key == 'a' && EQUAL_MODMASK  && (xctx->graph_flags & 4)) {
-        int floaters = there_are_floaters();
-        backannotate_at_cursor_b_pos(r, gr);
-        if(floaters) set_modify(-2); /* update floater caches to reflect actual backannotation */
-        redraw_all_at_end = 1;
-      }
       /* x cursor1 toggle */
       else if((key == 'a' && rstate == 0) ) {
         xctx->graph_flags ^= 2;
@@ -2698,15 +2691,6 @@ int rstate; /* (reduced state, without ShiftMask) */
     go_back(1);break;
    }
 
-   if(key=='a' && EQUAL_MODMASK)   /* graph annotate dc point @cursor2 */
-   {
-    if(xctx->semaphore >= 2) break;
-    if(waves_selected(event, key, state, button)) {
-      waves_callback(event, mx, my, key, button, aux, state);
-      break;
-    }
-    break;
-   }
    if(key=='a' && rstate == 0)   /* make symbol */
    {
     if(xctx->semaphore >= 2) break;
diff --git a/src/scheduler.c b/src/scheduler.c
index d1e7a109..23afcef9 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -4700,6 +4700,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
           else if(!strcmp(argv[2], "cursor1_x")) { /* set graph cursor1 position */
             xctx->graph_cursor1_x = atof_spice(argv[3]);
 
+            #if 0
             if(xctx->rects[GRIDLAYER] > 0) {
               Graph_ctx *gr = &xctx->graph_struct;
               xRect *r = &xctx->rect[GRIDLAYER][0];
@@ -4707,6 +4708,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
                 backannotate_at_cursor_b_pos(r, gr); 
               }
             }
+            #endif
           }
           else if(!strcmp(argv[2], "cursor2_x")) { /* set graph cursor2 position */
             xctx->graph_cursor2_x = atof_spice(argv[3]);