Remove some tasks from the TODO list
Update TODO