remove leftover cp_sp cruft from cancellation code, fix small bug