Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -636,29 +636,36 @@
 			       #t)
 			      ((and changed *time-to-exit*) ;; last sync
 			       #t)
 			      (else
 			       #f))))
-             (if (or dejunk do-cp)
+             
+               (if (or dejunk do-cp)
 		 (let* ((start-time (current-milliseconds))
 			(subdb    (or (dbfile:get-subdb dbstruct run-id) (dbfile:init-subdb dbstruct run-id dbfile:db-init-proc)))
 			(dbdat    (or (dbfile:get-dbdat dbstruct run-id) (dbfile:open-db dbstruct run-id dbfile:db-init-proc)))
 			(mtdb      (dbr:subdb-mtdbdat subdb))
 			;;
 			;; BUG: -mrw- I think this next line is wrong. run-id should be the path to .mtdb/<runid>.db
 			;; 
 			(tmpdb     (dbfile:open-db dbstruct run-id dbfile:db-init-proc)))
 		   
+                   (if dejunk
+                     (begin
+                       (debug:print 0 *default-log-port* "Cleaning nfs DB")
+                       (db:clean-up run-id mtdb)
+                       (debug:print 0 *default-log-port* "Cleaning tmp DB")
+                       (db:clean-up run-id tmpdb)
+                     )
+                   )
 		   (debug:print-info 2 *default-log-port* "delta syncing file: " srcfile ", time diff: " (- time1 time2) " seconds")
 		   (if old2new
                        (begin
-			 (if dejunk (db:clean-up run-id mtdb))
 			 (db:sync-tables (db:sync-all-tables-list
 					  (db:get-keys dbstruct))
 					 #f mtdb tmpdb))
                        (begin
-			 (if dejunk (db:clean-up run-id tmpdb))
 			 (db:sync-tables (db:sync-all-tables-list (db:get-keys dbstruct)) #f tmpdb mtdb)))
 		   (hash-table-set! sync-durations (conc srcfile ".db") (- (current-milliseconds) start-time)))
 		 (debug:print-info 2 *default-log-port* "skipping delta sync. " srcfile " is up to date"))))
 	 dbfiles))
     data-synced))
@@ -1180,12 +1187,18 @@
 ;;    a. If have tests that are not deleted, set state='unknown'
 ;;    b. ....
 ;;
 (define (db:clean-up run-id dbdat)
   (if run-id
-    (db:clean-up-rundb dbdat)
-    (db:clean-up-maindb dbdat)
+    (begin
+      (debug:print 0 *default-log-port* "Cleaning run DB " run-id)
+      (db:clean-up-rundb dbdat)
+    )
+    (begin
+      (debug:print 0 *default-log-port* "Cleaning main DB ")
+      (db:clean-up-maindb dbdat)
+    )
   )
 )
 
 
 ;; Clean out old junk and vacuum the database
@@ -1215,15 +1228,15 @@
     ;; (db:delay-if-busy dbdat)
     (sqlite3:with-transaction 
      db
      (lambda ()
        (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
+			       (debug:print-info 0 *default-log-port* "Test records count before clean: " tot))
 			     count-stmt)
        (map sqlite3:execute statements)
        (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
+			       (debug:print-info 0 *default-log-port* "Test records count after clean: " tot))
 			     count-stmt)))
     (map sqlite3:finalize! statements)
     (sqlite3:finalize! count-stmt)
     ;; (db:find-and-mark-incomplete db)
     ;; (db:delay-if-busy dbdat)
@@ -1262,15 +1275,15 @@
     ;; (db:delay-if-busy dbdat)
     (sqlite3:with-transaction 
      db
      (lambda ()
        (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count before clean: " tot))
+			       (debug:print-info 0 *default-log-port* "Run records count before clean: " tot))
 			     count-stmt)
        (map sqlite3:execute statements)
        (sqlite3:for-each-row (lambda (tot)
-			       (debug:print-info 0 *default-log-port* "Records count after  clean: " tot))
+			       (debug:print-info 0 *default-log-port* "Run records count after clean: " tot))
 			     count-stmt)))
     (map sqlite3:finalize! statements)
     (sqlite3:finalize! count-stmt)
     ;; (db:find-and-mark-incomplete db)
     ;; (db:delay-if-busy dbdat)