More TODO edits. More deprecated cruft.