Removing email functionality again.