Implement cleanup for parallel and singular queues