Remove some unused code.
Remove unused code.
Fix warning and add comment.