Removing queues and old datastore cruft