Prune unused utils and refine