Major cleanup of data.