Purging and queue cleanup now working