Fix message contents and drop certs and sigs