REMOVE stale noPayloadCheck comments