better data cleanup