data cleanup implemented