Eliminate some TODOs in the kind analyses.
Remove some dead code.