Reduce number of unused variable warnings

Christoph Grüningerrequested to merge
feature/less-unused-variables into master

Remove unused variabes. Declare loop variable within for statement.

Merge request reports