remove the Mail class since it is not used here