Remove todos

Remove some (not all) of the remaining `TODO`s in the codebase.