bogus linebreak
unused field
small fixes
sync with portable
move unused code to branch 346-envelope-validation