Work on optional clearing during cancel