Update people public profile emails and code cleanup.