Resolve warnings in merge request !25067

Merge request !25067 (merged) introduce some warnings. This merge request remove some variables which were not used to remove the warnings.