Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -519,10 +519,17 @@
     (5 "COMPLETED")
     (6 "LAUNCHED")
     (7 "REMOTEHOSTSTART")
     (8 "RUNNING")
     ))
+
+(define *common:dont-roll-up-states*
+  '("DELETED"
+    "REMOVING"
+    "CLEANING"
+    "ARCHIVE_REMOVING"
+    ))
 
 ;; BBnote: *common:std-statuses* dashboard filter control and test control status buttons defined here; used in set-fields-panel and dboard:make-controls
 ;; note these statuses are sorted from better to worse.
 ;; This sort order is important to dcommon:status-compare3 and db:set-state-status-and-roll-up-items
 (define *common:std-statuses*
@@ -556,10 +563,16 @@
 (define *common:cant-run-states*    ;; These are stopping conditions that prevent a test from being run
   '("COMPLETED" "KILLED" "UNKNOWN" "INCOMPLETE" "ARCHIVED"))
 
 (define *common:not-started-ok-statuses* ;; if not one of these statuses when in not_started state treat as dead
   '("n/a" "na" "PASS" "FAIL" "WARN" "CHECK" "WAIVED" "DEAD" "SKIP"))
+
+;; group tests into buckets corresponding to rollup
+;;; Running, completed-pass,  completed-non-pass + worst status, not started.
+;; filter out 
+;(define (common:categorize-items-for-rollup in-tests)
+;  (
 
 (define (common:special-sort items order comp)
   (let ((items-order (map reverse order))
         (acomp       (or comp >)))
     (sort items

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3521,22 +3521,22 @@
                             ;; (non-completes        (filter (lambda (x)
                             ;;                                 (not (equal? (dbr:counts-state x) "COMPLETED")))
                             ;;                               state-status-counts))
                             (all-curr-states      (common:special-sort  ;; worst -> best (sort of)
                                                        (delete-duplicates
-                                                        (if (not (equal? state "DELETED"))
+                                                        (if (not (member state *common:dont-roll-up-states*))
                                                             (cons state (map dbr:counts-state state-status-counts))
                                                             (map dbr:counts-state state-status-counts)))
                                                        *common:std-states* >))
                             (all-curr-statuses    (common:special-sort  ;; worst -> best
                                                    (delete-duplicates
-                                                    (if (not (equal? state "DELETED"))
+                                                    (if (not (member state *common:dont-roll-up-states*))
                                                         (cons status (map dbr:counts-status state-status-counts))
                                                         (map dbr:counts-status state-status-counts)))
                                                    *common:std-statuses* >))
 			    (non-completes     (filter (lambda (x)
-							 (not (member x '("DELETED" "COMPLETED"))))
+							 (not (member x (cons "COMPLETED" *common:dont-roll-up-states*))))
 						       all-curr-states))
 			    (num-non-completes (length non-completes))
                             
                             (newstate          (cond
 						((> running 0)