clean some todo-ses
cleaned some todo-ses)