util -> gutil
cleanup