Remove unused fields
Merge pull request #1541 from xt0rted/patch-4

Remove unused fields