diff --git a/extra/bootstrap/tools/tools.factor b/extra/bootstrap/tools/tools.factor
index f94bf80bbf..fab6a093ee 100755
--- a/extra/bootstrap/tools/tools.factor
+++ b/extra/bootstrap/tools/tools.factor
@@ -9,6 +9,5 @@ USING: vocabs.loader sequences ;
     "tools.profiler"
     "tools.test"
     "tools.time"
-    "tools.walker"
     "editors"
 } [ require ] each
diff --git a/extra/tools/interpreter/interpreter.factor b/extra/tools/interpreter/interpreter.factor
old mode 100644
new mode 100755
index a43a4b46ce..53de43b7e5
--- a/extra/tools/interpreter/interpreter.factor
+++ b/extra/tools/interpreter/interpreter.factor
@@ -6,6 +6,8 @@ kernel.private math namespaces namespaces.private prettyprint
 quotations sequences splitting strings threads vectors words ;
 IN: tools.interpreter
 
+: walk ( quot -- ) \ break add* call ;
+
 TUPLE: interpreter continuation ;
 
 : <interpreter> interpreter construct-empty ;
@@ -30,19 +32,17 @@ M: pair restore
 
 <PRIVATE
 
-: (step-into-call) \ break add* call ;
-
-: (step-into-if) ? (step-into-call) ;
+: (step-into-if) ? walk ;
 
 : (step-into-dispatch)
-    nth (step-into-call) ;
+    nth walk ;
 
 : (step-into-execute) ( word -- )
     dup "step-into" word-prop [
         call
     ] [
         dup compound? [
-            word-def (step-into-call)
+            word-def walk
         ] [
             execute break
         ] if
@@ -54,8 +54,8 @@ M: pair restore
 M: word (step-into) (step-into-execute) ;
 
 {
-    { call [ (step-into-call) ] }
-    { (throw) [ (step-into-call) ] }
+    { call [ walk ] }
+    { (throw) [ walk ] }
     { execute [ (step-into-execute) ] }
     { if [ (step-into-if) ] }
     { dispatch [ (step-into-dispatch) ] }
diff --git a/extra/tools/walker/authors.txt b/extra/tools/walker/authors.txt
deleted file mode 100644
index 1901f27a24..0000000000
--- a/extra/tools/walker/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Slava Pestov
diff --git a/extra/tools/walker/summary.txt b/extra/tools/walker/summary.txt
deleted file mode 100644
index 4bc76894d2..0000000000
--- a/extra/tools/walker/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Single-stepper breakpoint hook
diff --git a/extra/tools/walker/tags.txt b/extra/tools/walker/tags.txt
deleted file mode 100644
index ef1aab0d0e..0000000000
--- a/extra/tools/walker/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-tools
diff --git a/extra/tools/walker/walker.factor b/extra/tools/walker/walker.factor
deleted file mode 100644
index 4c8eae111e..0000000000
--- a/extra/tools/walker/walker.factor
+++ /dev/null
@@ -1,6 +0,0 @@
-! Copyright (C) 2007 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-IN: tools.walker
-USING: kernel sequences continuations ;
-
-: walk ( quot -- ) \ break add* call ;
diff --git a/extra/ui/tools/operations/operations.factor b/extra/ui/tools/operations/operations.factor
index 6860b79ffc..10cc268124 100755
--- a/extra/ui/tools/operations/operations.factor
+++ b/extra/ui/tools/operations/operations.factor
@@ -5,7 +5,7 @@ ui.tools.interactor ui.tools.listener ui.tools.profiler
 ui.tools.search ui.tools.traceback ui.tools.workspace generic
 help.topics inference inspector io.files io.styles kernel
 namespaces parser prettyprint quotations tools.annotations
-editors tools.profiler tools.test tools.time tools.walker
+editors tools.profiler tools.test tools.time tools.interpreter
 ui.commands ui.gadgets.editors ui.gestures ui.operations
 ui.tools.deploy vocabs vocabs.loader words sequences
 tools.browser classes ;
diff --git a/extra/ui/tools/tools-docs.factor b/extra/ui/tools/tools-docs.factor
old mode 100644
new mode 100755
index df795fa987..2b4b3f4efd
--- a/extra/ui/tools/tools-docs.factor
+++ b/extra/ui/tools/tools-docs.factor
@@ -1,5 +1,5 @@
 USING: editors help.markup help.syntax inspector io listener
-parser prettyprint tools.profiler tools.walker ui.commands
+parser prettyprint tools.profiler tools.interpreter ui.commands
 ui.gadgets.editors ui.gadgets.panes ui.gadgets.presentations
 ui.gadgets.slots ui.operations ui.tools.browser
 ui.tools.interactor ui.tools.listener ui.tools.operations