more elimination of todos