Mailer: removed unnecessary code