Choosing aggregated contact name and photo, cleanup

-cleanedUp classes: AggregationCandidate, Contact