Cleanup of data arrays

No match.