Clear up last batch of TODOs from last review