Removed some old TODO comments