Added queue cleanup on cancel() as well
Updated for release 0.99.4