Index: trunk/ippToPsps/jython/datastoreRemover.py
===================================================================
--- trunk/ippToPsps/jython/datastoreRemover.py	(revision 33470)
+++ trunk/ippToPsps/jython/datastoreRemover.py	(revision 33470)
@@ -0,0 +1,51 @@
+#!/usr/bin/env jython
+
+from datastore import Datastore
+import logging
+import sys
+import getopt
+
+from ipptopsps import IppToPsps
+from datastore import Datastore
+
+'''
+DatastoreRemover class
+'''
+class DatastoreRemover(IppToPsps):
+
+    '''
+    Constructor
+    '''
+    def __init__(self, argv):
+        super(DatastoreRemover, self).__init__(argv)
+
+        if len(sys.argv) < 3:
+            self.printUsage()
+            self.exitProgram("incorrect args")
+
+        self.datastore = Datastore(self.logger, self.config, self.ippToPspsDb)
+
+    '''
+    Runs...
+    '''
+    def run(self):
+
+        if len(sys.argv) < 4:
+           self.datastore.remove(str(sys.argv[2]))
+        else:
+           self.datastore.removeRange(str(sys.argv[2]), str(sys.argv[3]))
+
+    '''
+    Overrides base-class version
+    '''
+    def printUsage(self):
+        super(DatastoreRemover, self).printUsage("<firstBatchToRemove> [<lastBatchToRemove>]")
+
+
+'''
+Start of program
+'''
+datastoreRemover = DatastoreRemover(sys.argv)
+datastoreRemover.run()
+datastoreRemover.exitProgram("finished")
+
Index: trunk/ippToPsps/jython/removeFromDatastore.py
===================================================================
--- trunk/ippToPsps/jython/removeFromDatastore.py	(revision 33457)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#!/usr/bin/env jython
-
-from datastore import Datastore
-import logging
-import sys
-import getopt
-
-
-from config import Config
-from pslogger import PSLogger
-from ipptopspsdb import IppToPspsDb
-
-
-
-if len(sys.argv) < 3:
-    print "** Usage: " + sys.argv[0] + " <configPath> <firstBatchToRemove> [<lastBatchToRemove>]"
-    sys.exit(1)
-
-CONFIGFILE = sys.argv[1]
-
-# create objects
-config = Config(CONFIGPATH)
-logger = config.getLogger(sys.argv[0])
-ippToPspsDb = IppToPspsDb(logger, config)
-datastore = Datastore(logger, config, ippToPspsDb)
-
-if len(sys.argv) < 4:
-    datastore.remove(str(sys.argv[2]))
-else:
-    datastore.removeRange(str(sys.argv[2]), str(sys.argv[3]))
-