[cosmetics] removed unused variables and code
Merge pull request #5021 from mkortstiege/unused

[cosmetics] removed unused variables and code