Index: trunk/ippToPsps/jython/cleanup.py
===================================================================
--- trunk/ippToPsps/jython/cleanup.py	(revision 35097)
+++ trunk/ippToPsps/jython/cleanup.py	(revision 35311)
@@ -73,13 +73,13 @@
         self.logger.infoTitle("Cleaning up batch type %s" % batchType)
 
-        loadedDatastoreIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType)
-        deleteFromDxLayerIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType)
-        mergedLocalIDs = self.ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType)
+        mergedLocalIDs = self.ippToPspsDb.getMergedReadyToDeleteFromLocalDisk(batchType)
+        purgedLocalIDs = self.ippToPspsDb.getPurgedReadyToDeleteFromLocalDisk(batchType)
+        deleteFromLocalIDs = mergedLocalIDs + purgedLocalIDs
 
-        purgedDatastoreIDs = self.ippToPspsDb.getPurgedButNotDeletedFromDatastore(batchType)
-        purgedLocalIDs = self.ippToPspsDb.getPurgedButNotDeletedFromLocalDisk(batchType)
+        loadedDatastoreIDs = self.ippToPspsDb.getLoadedToODMReadyToDeleteFromDatastore(batchType)
+        purgedDatastoreIDs = self.ippToPspsDb.getPurgedReadyToDeleteFromDatastore(batchType)
+        deleteFromDatastoreIDs = loadedDatastoreIDs + purgedDatastoreIDs
 
-        deleteFromDatastoreIDs = loadedDatastoreIDs + purgedDatastoreIDs
-        deleteFromLocalIDs = mergedLocalIDs + purgedLocalIDs
+        deleteFromDxLayerIDs = self.ippToPspsDb.getLoadedToODMReadyToDeleteFromDxLayer(batchType)
 
         # report to log what we are going to do