diff --git a/scmvm.scm b/scmvm.scm
index 71630e0..cb69e95 100644
--- a/scmvm.scm
+++ b/scmvm.scm
@@ -3,18 +3,6 @@
   #:use-module (scmvm assembler)
   #:use-module (scmvm debugger)
   #:use-module (ice-9 ports)
-  #:re-export ( ;; vm
-               make-vm run-vm vm-load-program!
-               vm-memory-ref vm-memory-set!
-               vm-pc vm-pc-set!
-               ;; assembler
-               assemble
-               ;; debugger
-               make-debugger debugger-continue debugger-step
-               debugger-vm
-               debugger-breakpoints debugger-breakpoints-set!
-               debugger-breakpoint-add! debugger-breakpoint-ref
-               debugger-breakpoint-enable! debugger-breakpoint-disable!)
   #:export (read-all-instructions instructions-from-file))
 
 (define (read-all-instructions)
diff --git a/scratch.scm b/scratch.scm
index 5680ff4..7048f18 100644
--- a/scratch.scm
+++ b/scratch.scm
@@ -1,4 +1,7 @@
-(use-modules (scmvm))
+(use-modules (scmvm)
+	     (scmvm vm)
+	     (scmvm assembler)
+	     (scmvm debugger))
 
 (define my-instructions (instructions-from-file "./asm/runtime.scm"))
 (define my-debugger (make-debugger my-instructions))