diff --git a/cron.yaml b/cron.yaml
index f6b65d39..325ad870 100644
--- a/cron.yaml
+++ b/cron.yaml
@@ -2,7 +2,3 @@ cron:
 - description: cleanup job
   url: /r3m0v3r
   schedule: every 2 hours
-
-- description: orphan cleanup job
-  url: /r3m0v3rOrphans
-  schedule: every 48 hours
diff --git a/utils/remover.py b/utils/remover.py
index 9311fcb6..4fd84d9d 100644
--- a/utils/remover.py
+++ b/utils/remover.py
@@ -42,20 +42,18 @@ class Remover(webapp.RequestHandler):
         fics = DownloadMeta.all()
         fics.filter("date <",theDate).order("date")
         
-        num = 0
-        while( True ) :
-            results = fics.fetch(100)
-            if not results:
-                self.response.out.write('Finished<br>')
-                break
-            logging.debug([x.name for x in results])
+        results = fics.fetch(100)
+        if not results:
+            self.response.out.write('Finished<br>')
+            break
+        logging.debug([x.name for x in results])
 
-            for d in results:
-                d.delete()
-                for c in d.data_chunks:
-                    c.delete()
-                num += 1
-                logging.debug('Delete '+d.url)
+        for d in results:
+            d.delete()
+            for c in d.data_chunks:
+                c.delete()
+            num += 1
+            logging.debug('Delete '+d.url)
 
         logging.info('Deleted instances: %d' % num)
         self.response.out.write('Deleted instances: %d<br>' % num)
@@ -70,7 +68,7 @@ class RemoveOrphanDataChunks(webapp.RequestHandler):
 
         deleted = 0
         num = 0
-        step=2
+        step=100
         while( True ) :
             results = chunks.fetch(limit=step,offset=num-deleted)
             if not results: