Solve and remove some todos.