Fix a few type annotation comments.
Remove unused function.