@@ -67,17 +67,24 @@
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
-     readline apropos json http-client directory-utils typed-records
-     http-client srfi-18 extras format)
+(import
+ (prefix sqlite3 sqlite3:) srfi-1
+ ;; posix
+ regex regex-case srfi-69 (prefix base64 base64:)
+ breadline apropos json http-client
+ ;; directory-utils
+ typed-records
+ http-client srfi-18
+ ;; extras
+ (chicken.format)
 
-;; Added for csv stuff - will be removed
-;;
-(use sparse-vectors)
+ ;; Added for csv stuff - will be removed
+ ;;
+ sparse-vectors)
 
 (require-library mutils)
 
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
 (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
@@ -2399,13 +2406,13 @@
 
 	    (repl))
 	   (else
 	    (begin
 	      (set! *db* dbstructs)
-	      (import extras) ;; might not be needed
+	      ;; (import extras) ;; might not be needed
 	      ;; (import csi)
-	      (import readline)
+	      (import breadline)
 	      (import apropos)
 	      (import dbfile)
 	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 
 	      (if *use-new-readline*