Index: trunk/ippToPsps/jython/cleanup.py
===================================================================
--- trunk/ippToPsps/jython/cleanup.py	(revision 33818)
+++ trunk/ippToPsps/jython/cleanup.py	(revision 35097)
@@ -26,5 +26,5 @@
         super(Cleanup, self).__init__(argv)
 
-        self.datastore = Datastore(self.logger, self.config, self.ippToPspsDb)
+        self.datastore = Datastore(self.logger, self.skychunk, self.ippToPspsDb)
         self.dxlayer = DXLayer(self.logger)
         if len(argv) > 2: self.parsePollTimeArg(sys.argv[2]) 
@@ -40,6 +40,6 @@
 
             self.logger.infoSeparator()
-            self.logger.infoPair("Config", self.config.name)
-            self.config.printDeletionPolicy()
+            self.logger.infoPair("Skychunk", self.skychunk.name)
+            self.skychunk.printDeletionPolicy()
             self.clean("IN")
             self.clean("P2")
@@ -89,9 +89,9 @@
     
         # delete stuff from local disk
-        if self.config.deleteLocal:
+        if self.skychunk.deleteLocal:
             count = 0
             for id in deleteFromLocalIDs:
         
-                if Batch.deleteFromDisk(self.logger, self.config.basePath, batchType, self.config.dvoLabel, id):
+                if Batch.deleteFromDisk(self.logger, self.skychunk.basePath, batchType, self.skychunk.dvoLabel, id):
                     self.ippToPspsDb.updateDeletedLocal(id, 1)
                     count = count + 1
@@ -100,5 +100,5 @@
     
         # remove stuff from datastore
-        if self.config.deleteDatastore:
+        if self.skychunk.deleteDatastore:
             count = 0
             for id in deleteFromDatastoreIDs:
@@ -112,5 +112,5 @@
         
         # remove stuff from DXLayer
-        if self.config.deleteDxLayer:
+        if self.skychunk.deleteDxLayer:
             count = 0
             for id in deleteFromDxLayerIDs: