Use new hashing and cleanup editor queues