Email address cleanup