SMTP: removed extra undesired returns