Queue cleanup

Queue cleanup