Kill read_payload, fix comment