removed some old todos