Small update.

remove some unused arguments and variable.