Remove unused local variables
Merge pull request #5288 from maksqwe/remove_unused

Cleanup unused local variables