diff --git a/src/ikarus.boot b/src/ikarus.boot
index 9a40014..62cdb0d 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/libcompile.ss b/src/libcompile.ss
index 5176520..1c472c6 100644
--- a/src/libcompile.ss
+++ b/src/libcompile.ss
@@ -5212,18 +5212,9 @@
       (let ([proc ($code->closure code)])
         (proc)))))
 
-
 (primitive-set! 'eval-core
   (lambda (x) ((compile-core-expr x))))
 
-(primitive-set! 'eval
-  (lambda (x)
-    (compile x)))
-
-(primitive-set! 'load-handler
-  (lambda (x)
-    (chi-top-library x)
-    (void)))
 
 ))
 
diff --git a/src/library-manager.ss b/src/library-manager.ss
index 8cf58c7..eeb54c1 100644
--- a/src/library-manager.ss
+++ b/src/library-manager.ss
@@ -402,10 +402,10 @@
       [exit       exit-label       (core-prim . exit)]
       [compile    compile-label    (core-prim . compile)]
       [compile-core-expr-to-port    compile-core-expr-to-port-label    (core-prim . compile-core-expr-to-port)]
-      [eval       eval-label       (core-prim . eval)]
+      ;[eval       eval-label       (core-prim . eval)]
       [eval-core  eval-core-label  (core-prim . eval-core)]
       [load       load-label       (core-prim . load)]
-      [load-handler       load-handler-label       (core-prim . load-handler)]
+      ;[load-handler       load-handler-label       (core-prim . load-handler)]
       [assembler-output       assembler-output-label       (core-prim . assembler-output)]
       [expand       expand-label       (core-prim . expand)]
       [fasl-write       fasl-write-label       (core-prim . fasl-write)]
diff --git a/src/libtokenizer.ss b/src/libtokenizer.ss
index 4790d41..7641b98 100644
--- a/src/libtokenizer.ss
+++ b/src/libtokenizer.ss
@@ -789,6 +789,10 @@
           (error 'comment-handler "~s is not a procedure" x))
         x)))
   (let ()
+    (define load-handler
+      (lambda (x)
+        (chi-top-library x)
+        (void)))
     (define read-and-eval
       (lambda (p eval-proc)
         (let ([x (my-read p)])