Minor cleanup of unused fields and such.
Merge pull request #2735 from jakewins/2.2-cleanup

Minor cleanup of unused fields and such.