More work on cleaning up existing data.