Refactoring and simplification for in-band cancelation