Queue cleanup

queue-cleanup