lib/util cleanup