Resolve warnings in merge request !25067

Jing Chenrequested to merge
jichen/athena:rmWarningsInMaster3107 into master

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

Merge request reports