Clean up the residual annotations when resources are preempted by pp from cpp

Clean up the residual annotations when resources are preempted by pp from cpp #6900