Kill some unused fields/imports.
Merge pull request #145 from csmith/master

Kill some unused fields/imports.