Add raw-body, remove body