Remove send-helper messages. Introduce payloadBuffer