Introduce canceling on delete flag and start

to move some logic to be sync. Do not enable
the feature flag without completing TODO.