Unused variables removed/commented

Merged Wouter Deconinck requested to merge wdconinc-master-patch-68799 into master

Strange... this should have been caught by -Werror.

Merge request reports