[lib/utils] clean up