Improve mailer coverage and remove unused code from app