Remove some unused variables

Removed some unused variables, nothing really fancy here ;)

Edit: oops, wait a minute.. 300 commits behind.. let me fix :)
**Edit2**: fixed