remove some old TODO comments