add back util dir
clean up