Cleanup unused parameters

PROD-31587

Change-Id: I449b5918e2ff9e21bfa6748ef58909eb7a1d058d
(cherry picked from commit 43ca6344c07363a69607ffae37b16558d92a0aff)
9 files changed