Removed more mailing code