remove the MAIL_COUNT logic