final data cleanup