formatting, and removing some obsolete fields

Change-Id: I3184c26864d0be65b6ef83f1eb59993e85e5426a