Removed old code from a different mail module