removed task-util, small cleanup