Update some comments, remove dead code.