Remove email addresses pending better solution