Index: trunk/ippTools/share/warptool_change_skyfile_data_state.sql
===================================================================
--- trunk/ippTools/share/warptool_change_skyfile_data_state.sql	(revision 23394)
+++ trunk/ippTools/share/warptool_change_skyfile_data_state.sql	(revision 23418)
@@ -8,6 +8,2 @@
     warp_id = %lld
     AND skycell_id = '%s'
-    -- only update if chipRun.state has the expected value
---    AND (
---        SELECT state from warpRun where warpRun.warp_id = warpSkyfile.warp_id
---    ) = '%s'
Index: trunk/ippTools/share/warptool_definebyquery.sql
===================================================================
--- trunk/ippTools/share/warptool_definebyquery.sql	(revision 23394)
+++ trunk/ippTools/share/warptool_definebyquery.sql	(revision 23418)
@@ -9,4 +9,5 @@
         rawExp.dateobs,
         rawExp.exp_tag,
+        rawExp.exp_name,
         rawExp.exp_type,
         rawExp.filelevel,
Index: trunk/ippTools/share/warptool_pendingcleanuprun.sql
===================================================================
--- trunk/ippTools/share/warptool_pendingcleanuprun.sql	(revision 23394)
+++ trunk/ippTools/share/warptool_pendingcleanuprun.sql	(revision 23418)
@@ -13,3 +13,3 @@
 USING (exp_id)
 WHERE
-    (warpRun.state = 'goto_cleaned' OR warpRun.state = 'goto_purged')
+    (warpRun.state = 'goto_cleaned' OR warpRun.state = 'goto_scrubbed' OR warpRun.state = 'goto_purged')
Index: trunk/ippTools/share/warptool_pendingcleanupskyfile.sql
===================================================================
--- trunk/ippTools/share/warptool_pendingcleanupskyfile.sql	(revision 23394)
+++ trunk/ippTools/share/warptool_pendingcleanupskyfile.sql	(revision 23418)
@@ -10,5 +10,7 @@
     USING(warp_id)
 WHERE
-    (warpRun.state = 'goto_cleaned' AND warpSkyfile.data_state = 'full')
+   ((warpRun.state = 'goto_cleaned'  AND warpSkyfile.data_state = 'full')
     OR
-    (warpRun.state = 'goto_purged' AND warpSkyfile.data_state != 'purged')
+    (warpRun.state = 'goto_scrubbed' AND warpSkyfile.data_state = 'full')
+    OR
+    (warpRun.state = 'goto_purged'   AND warpSkyfile.data_state != 'purged'))