code clean up, rm rfc4627