Removed all naked uses of util.