Remove obsolete field
Fix DocComments