Added clean option to aggregate