More util references to remove.