more code cleaning in patchpayload