fix data cleanup