Update comments, remove cancelled TODO items, remove dead code.