Cleaning up data generator