am e645715b: Clean up under the util package.

* commit 'e645715b2575d462dafd09e98fce84555549b65b':
  Clean up under the util package.