Moved de-duping onto content flatmap