Cleanup unused arguments.
Merge pull request #6733 from ktf/cleanup-unused

Cleanup unused arguments.