@@ -134,11 +134,11 @@
 ;; A hash table that can be accessed by #{scheme ...} calls in
 ;; config files. Allows communicating between confgs
 ;;
 (define *user-hash-data* (make-hash-table))
 
-(define *db-keys* #f)
+;; (define *db-keys* #f)
 
 (define *pkts-info*    (make-hash-table)) ;; store stuff like the last parent here
 (define *configinfo*   #f)   ;; raw results from setup, includes toppath and table from megatest.config
 (define *runconfigdat* #f)   ;; run configs data
 (define *configdat*    #f)   ;; megatest.config data
@@ -152,17 +152,13 @@
 ;; (define *alt-log-file* #f)  ;; used by -log
 ;; (define *common:denoise*    (make-hash-table)) ;; for low noise printing
 (define *default-log-port*  (current-error-port))
 (define *time-zero* (current-seconds)) ;; for the watchdog
 (define *on-exit-procs* '()) ;; add procs to this list to be executed on exit
-(define *default-area-tag* "local")
 
 ;; DATABASE
 ;; (define *dbstruct-dbs*         #f) ;; used to cache the dbstruct in db:setup. Goal is to remove this.
-;; db stats
-(define *db-stats*            (make-hash-table)) ;; hash of vectors < count duration-total >
-(define *db-stats-mutex*      (make-mutex))
 ;; db access
 (define *db-last-access*      (current-seconds)) ;; last db access, used in server
 ;; (define *db-write-access*     #t)
 ;; db sync
 ;; (define *db-last-sync*        0)                 ;; last time the sync to megatest.db happened
@@ -202,11 +198,11 @@
 (define *rpc:listener*      #f)
 
 ;; KEY info
 (define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
 (define *keys*              (make-hash-table)) ;; cache the keys here
-(define *keyvals*           (make-hash-table))
+;; (define *keyvals*           (make-hash-table))
 (define *toptest-paths*     (make-hash-table)) ;; cache toptest path settings here
 (define *test-paths*        (make-hash-table)) ;; cache test-id to test run paths here
 (define *test-ids*          (make-hash-table)) ;; cache run-id, testname, and item-path => test-id
 (define *test-info*         (make-hash-table)) ;; cache the test info records, update the state, status, run_duration etc. from testdat.db
 
@@ -296,40 +292,10 @@
     (else "FAIL")))
 
 (define (common:logpro-exit-code->test-status exit-code)
   (status-sym->string (common:logpro-exit-code->status-sym exit-code)))
 
-;; 
-(defstruct remote
-
-  ;; transport to be used
-  ;; http              - use http-transport
-  ;; http-read-cached  - use http-transport for writes but in-mem cached for reads
-  (rmode            'http)
-  (hh-dat            (let ((res (or (server:choose-server *toppath* 'homehost)
-				    (cons #f #f))))
-		       (assert (pair? res)(conc "FATAL: hh-dat should be a pair, got "res))
-		       res))
-  (server-url        #f) ;; (server:check-if-running *toppath*) #f))
-  (server-id         #f)
-  (server-info       #f) ;; (if *toppath* (server:check-if-running *toppath*) #f))
-  (last-server-check 0)  ;; last time we checked to see if the server was alive
-  (connect-time      (current-seconds)) ;; when we first connected
-  (last-access       (current-seconds)) ;; last time we talked to server
-  ;; (conndat           #f) ;; iface port api-uri api-url api-req seconds server-id
-  (server-timeout    (server:expiration-timeout))
-  (force-server      #f)
-  (ro-mode           #f)  
-  (ro-mode-checked   #f) ;; flag that indicates we have checked for ro-mode
-
-  ;; conndat stuff
-  (iface             #f) ;; TODO: Consolidate this data with server-url and server-info above
-  (port              #f)
-  (api-url           #f)
-  (api-uri           #f)
-  (api-req           #f))
-
 ;; launching and hosts
 (defstruct host
   (reachable    #f)
   (last-update  0)
   (last-used    0)
@@ -353,11 +319,11 @@
 (define *verbosity-cache*    (make-hash-table))
 
 (define (common:clear-caches)
   (set! *target*             (make-hash-table))
   (set! *keys*               (make-hash-table))
-  (set! *keyvals*            (make-hash-table))
+  ;; (set! *keyvals*            (make-hash-table))
   (set! *toptest-paths*      (make-hash-table))
   (set! *test-paths*         (make-hash-table))
   (set! *test-ids*           (make-hash-table))
   (set! *test-info*          (make-hash-table))
   (set! *run-info-cache*     (make-hash-table))
@@ -1298,10 +1264,14 @@
       (if (and (getenv "MT_ITEMPATH")
                (not (equal? (getenv "MT_ITEMPATH") "")))
           (getenv "MT_TEST_NAME")
           (conc (getenv "MT_TEST_NAME") "/" (getenv "MT_ITEMPATH")))
       #f))
+
+(define (common:get-valid-values)
+  (let ((s (configf:lookup *configdat* "validvalues" class)))
+    (if s (string-split s) #f)))
 
 ;;======================================================================
 ;; logic for getting homehost. Returns (host . at-home)
 ;; IF *toppath* is not set, wait up to five seconds trying every two seconds
 ;; (this is to accomodate the watchdog)