CB-4084 Delete email entries with empty value