more data cleanup