cleanup email fields