Remove watches on destroy; add cell-let; cleanup