Remove unused variables.
Merge pull request #851 from nico/cleanup

Remove unused variables.