@@ -2289,29 +2289,10 @@
     path-out
   )
 )
 
 
-;; (define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep)
-;;   (let ((data (runs:get-all-but-most-recent-n-per-target target-patts runpatt num-to-keep)))
-;;     (for-each
-;;      (lambda (target)
-;;        (let ((runs-to-remove (hash-table-ref data target )))
-;;          (for-each
-;;           (lambda (run)
-;;             (print "megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))
-;;           runs-to-remove)))
-;;      (hash-table-keys data))))
-
-;; Remove runs
-;; fields are passing in through 
-;; action:
-;;    'remove-runs
-;;    'set-state-status
-;;
-;; NB// should pass in keys?
-;;
 (define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode #f)(options '()))
   (common:clear-caches) ;; clear all caches
   (let* ((db           #f)
 	 ;; (tdbdat       (tasks:open-db))
 	 (keys         (rmt:get-keys))
@@ -2545,11 +2526,11 @@
                                       (begin
                                        (let ((rundir (db:test-get-rundir new-test-dat)))
                                         (if (and (not (string=  rundir "/tmp/badname")) 
                                              (file-exists? rundir)
                                              (substring-index run-name rundir)
-                                             (substring-index target rundir)
+                                             (tests:glob-like-match (conc "%/" target "/%") rundir)
                                              )
                                           (begin
                                             (set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
                                             (set! lastrealpath (remove-last-path-directory (resolve-pathname lasttpath)))
                                             (hash-table-set! run-paths-hash lastrealpath 1)
@@ -2558,11 +2539,13 @@
                                           (begin
                                             (debug:print 2 *default-log-port* "Not removing directory " rundir " because either it doesn't exist or has a bad name")
                                             (debug:print 2 *default-log-port* "Is /tmp/badname: " (string=  rundir "/tmp/badname"))
                                             (debug:print 2 *default-log-port* "Exists: " (file-exists? rundir))
                                             (debug:print 2 *default-log-port* "Has run-name: " (substring-index run-name rundir))
-                                            (debug:print 2 *default-log-port* "Has target: " (substring-index target rundir))
+                                            (debug:print 2 *default-log-port* "Has target: " (tests:glob-like-match (conc "%/" target "/%") rundir))
+                                            (debug:print 2 *default-log-port* "Target: " target)
+
                                             ;;PJH remove record from db no need to cleanup directory
                                             (case mode
                                                ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
                                                ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
                                                (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))