Removed old code from EmailHelper