Task #10602 - remove email addresses