Get rid of deprecated `extractPayload` references.