Remove more old TODO notes