Remove unused variables and move one into inner scope.
Remove unused variables and move one into inner scope.

Christof/voly-labeller,Christof/voly-labeller,Christof/voly-labeller,Christof/voly-labeller