Index: NOTES
==================================================================
--- NOTES
+++ NOTES
@@ -12,15 +12,10 @@
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #     GNU General Public License for more details.
 # 
 #     You should have received a copy of the GNU General Public License
 #     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-(server:writable-watchdog-bruteforce dbstruct)
-
-(server:writable-watchdog-deltasync dbstruct)
-
 
 =====================================================================
 NOTES from looking at branch v1.62-rpc
 =====================================================================
 

Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -262,11 +262,11 @@
                    ;; ARCHIVES
                    ;; ((archive-get-allocations)   
                    ((archive-register-disk)     (apply db:archive-register-disk dbstruct params))
                    ((archive-register-block-name)(apply db:archive-register-block-name dbstruct params))
                    ;; ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey))
-		   
+
                    ;;======================================================================
                    ;; READ ONLY QUERIES
                    ;;======================================================================
 
                    ;; KEYS

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -537,11 +537,10 @@
          "-show-cmdinfo"
 	 "-cleanup-db"))
        (no-watchdog-args-vals (filter (lambda (x) x)
                                       (map args:get-arg no-watchdog-args)))
        (start-watchdog (null? no-watchdog-args-vals)))
-       ;;(print  "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals " start-watchdog-specail-arg-val:" start-watchdog-specail-arg-val " start-watchdog:" start-watchdog) 
   ;;(BB> "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals) 
   (if start-watchdog
       (thread-start! *watchdog*)))
 
 

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -553,11 +553,11 @@
 		;; didn't get the lock, check to see if current update started later than this 
 		;; update, if so we can exit without doing any work
 		(if (> my-start-time (handle-exceptions
 					 exn
 				       (begin
-					 (print "failed to get mod time on " lockf ", exn=" exn)
+					 (debug:print 0 *default-log-port* "failed to get mod time on " lockf ", exn=" exn)
 					 0)
 				       (file-modification-time lockf)))
 		    ;; we started since current re-gen in flight, delay a little and try again
 		    (begin
 		      (debug:print-info 1 *default-log-port* "Waiting to update " outputfilename ", another test currently updating it")