data generator cleanup