Removed Extra Mail Code