Thinned out the todo list!