@@ -442,23 +442,18 @@
 ;;======================================================================
 ;; Move me elsewhere ...
 ;; RADT => Why do we meed the version check here, this is called only if version misma
 ;;
 (define (common:cleanup-db dbstruct #!key (full #f))
-  (debug:print 0 *default-log-port* "WARNING: common:cleanup-db has NOT been reimplemented yet! Please fix!")
-  #;(apply db:multi-db-sync 
+  (apply db:multi-db-sync 
    dbstruct
    'schema
-   ;; 'new2old
    'killservers
    'adj-target
-   ;; 'old2new
    'new2old
-   ;; (if full
-       '(dejunk)
-       ;; '())
-       )
+   '(dejunk)
+  )
   (if (common:api-changed?)
       (common:set-last-run-version)))
 
 (define (common:snapshot-file filepath #!key (subdir  ".") )
   (if (file-exists? filepath)
@@ -949,10 +944,22 @@
 		(begin
 		  (debug:print-error 0 *default-log-port* "Unable to find megatest home directory.")
 		  #f)
 		(loop (pathname-directory thepath)))))
       ))
+
+
+(define (common:db-tmp-area-path)
+  (conc "/tmp/" 
+         (current-user-name)
+	 "/megatest_localdb/"
+	 (common:get-testsuite-name)
+         "/"
+	 (string-translate *toppath* "/" ".")
+  )
+)
+
 
 ;;======================================================================
 ;; redefine for future cleanup (converge on area-name, the more generic
 ;;
 (define common:get-area-name common:get-testsuite-name)
@@ -2518,17 +2525,10 @@
 
 ;;======================================================================
 ;; E N V I R O N M E N T   V A R S
 ;;======================================================================
 
-(define (bb-check-path #!key (msg "check-path: "))
-  (let ((path (or (get-environment-variable "PATH") "none")))
-    (debug:print-info 0 *default-log-port* (conc msg" : $PATH="path))
-    (if (string-match "^.*/isoenv-core/.*" path)
-        (debug:print-error 0 *default-log-port* (conc msg" : !!ISOENV PRESENT!!")) ;; remove for prod
-        (debug:print-info 1 *default-log-port* (conc msg" : **no isoenv present**")))))
-	      
 (define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF" "MAKEOVERRIDES" "HOSTNAME")))
   ;;(bb-check-path msg: "save-environment-as-files entry")
   (let ((envvars (get-environment-variables))
         (whitesp (regexp "[^a-zA-Z0-9_\\-:,\\.\\/%$]"))
 	(mungeval (lambda (val)
@@ -2539,13 +2539,16 @@
     (with-output-to-file (conc fname ".csh")
        (lambda ()
           (for-each (lambda (keyval)
 		      (let* ((key   (car keyval))
 			     (val   (cdr keyval))
-			     (delim (if (string-search whitesp val) 
+			     (delim (if (and (string-search whitesp val)
+					     (not (string-search "^\".*\"$" val))
+					     (not (string-search "^'.*'$" val)))
 					"\""
 					"")))
+					
 			(print (if (or (member key ignorevars)
 				       (string-search whitesp key))
 				   "# setenv "
 				   "setenv ")
 			       key " " delim (mungeval val) delim)))
@@ -2553,11 +2556,13 @@
      (with-output-to-file (conc fname ".sh")
        (lambda ()
           (for-each (lambda (keyval)
 		      (let* ((key (car keyval))
 			     (val (cdr keyval))
-			     (delim (if (string-search whitesp val) 
+			     (delim (if (and (string-search whitesp val)
+					     (not (string-search "^\".*\"$" val))
+					     (not (string-search "^'.*'$" val)))
 					"\""
 					"")))
 			(print (if (or (member key ignorevars)
 				       (string-search whitesp key)
 				       (string-search ":" key)) ;; internal only values to be skipped.