Remove unused parameters and variable
(cherry picked from commit 58bc23b233ed8ac84c34bae1b7313b1dfbcbbb3b)