Update TODO, removed 2 entries