diff --git a/contrib/walker/walker.lisp b/contrib/walker/walker.lisp
index b80cfd6..9779323 100644
--- a/contrib/walker/walker.lisp
+++ b/contrib/walker/walker.lisp
@@ -183,13 +183,6 @@
    (body :initarg :body
          :reader ast-body)))
 
-(defclass let*-form (ast)
-  ((bindings :initarg :bindings
-             :type (proper-list let-binding-form)
-             :reader ast-bindings)
-   (body :initarg :body
-         :reader ast-body)))
-
 (defclass flet-binding-form (ast)
   ((binding :initarg :binding :reader ast-binding)
    (lambda-list :initarg :lambda-list :reader ast-lambda-list)
@@ -202,12 +195,6 @@
    (body :initarg :body
          :reader ast-body)))
 
-(defclass labels-form (ast)
-  ((bindings :initarg :bindings
-             :reader ast-bindings)
-   (body :initarg :body
-         :reader ast-body)))
-
 (defclass setq-form (ast)
   ((arguments :initarg :arguments
               :reader ast-arguments)))
@@ -424,7 +411,7 @@
                            :collect (make-instance 'lexical-function-binding
                                                    :name name)))
            (env (extend-env* env bindings)))
-      (make-instance 'labels-form
+      (make-instance 'flet-form
                      :bindings (loop :for definition :in definitions
                                      :for binding :in bindings
                                      :for n :from 0
@@ -553,7 +540,7 @@
       (multiple-value-bind (forms declare-form)
           (parse-body body)
         ;; TODO: declare
-        (make-instance 'let*-form
+        (make-instance 'let-form
                        :path (cons 0 path)
                        :bindings bindings
                        :body (walk-forms walker
@@ -793,10 +780,6 @@
   (visit-foreach visitor (ast-bindings ast))
   (visit-foreach visitor (ast-body ast)))
 
-(defmethod visit (visitor (ast let*-form))
-  (visit-foreach visitor (ast-bindings ast))
-  (visit-foreach visitor (ast-body ast)))
-
 (defmethod visit (visitor (ast flet-binding-form))
   (visit visitor (ast-lambda-list ast))
   (visit-foreach visitor (ast-body ast)))
@@ -805,10 +788,6 @@
   (visit-foreach visitor (ast-bindings ast))
   (visit-foreach visitor (ast-body ast)))
 
-(defmethod visit (visitor (ast labels-form))
-  (visit-foreach visitor (ast-bindings ast))
-  (visit-foreach visitor (ast-body ast)))
-
 (defmethod visit (visitor (ast setq-form))
   (visit-foreach visitor (ast-arguments ast)))