[cleanup] Reduce number of unused variable warnings

added cleanup label

assigned to @ansgar

Thanks! @ansgar, can you have a look?

merged

mentioned in commit 89e349f7