remove all remaining cancel methods