Cleaned up job cancellation handling