Remove completely unused variables and private fields
Merge pull request #304 from mstorsjo/remove-unused-variables

Remove completely unused variables and private fields