Removed a couple of "TODO:" comments that no longer apply.