Better cancellation cleanup