Ignore cancelled

and a cleanup