Remove unused fields
Merge pull request #7 from sharwell/remove-unused

Remove unused fields