Remove utils; update affinity resolution