removed some to-do