diff --git a/C/index.c b/C/index.c
index b701a44e6..3b56d1cf4 100644
--- a/C/index.c
+++ b/C/index.c
@@ -2427,6 +2427,9 @@ add_info(ClauseDef *clause, UInt regno)
     case _call_bfunc_yy:
       cl = NEXTOP(cl,plyys);
       break;
+    case _pop:
+      cl = NEXTOP(cl,e);
+      break;
     case _Ystop:
     case _Nstop:
     case _try_me:
@@ -2503,7 +2506,6 @@ add_info(ClauseDef *clause, UInt regno)
 #if !defined(YAPOR)
     case _or_last:
 #endif  /* !YAPOR */
-    case _pop:
     case _index_pred:
     case _lock_pred:
 #if THREADS
diff --git a/C/tracer.c b/C/tracer.c
index 3caf9af9d..a0496a460 100644
--- a/C/tracer.c
+++ b/C/tracer.c
@@ -164,10 +164,6 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
   LOCK(Yap_heap_regs->low_level_trace_lock);
   sc = Yap_heap_regs;
   vsc_count++;
-  if (vsc_count < 2473000LL)
-    return;
-  if (vsc_count == 2473801LL)
-    jmp_deb(1);
 #ifdef THREADS
   Yap_heap_regs->thread_handle[worker_id].thread_inst_count++;
 #endif