Merge pull request #1897 from dj2/unused

Comment out unused params; Fix type warning.