More utils cleanup