OZP-692: separate cancel class