clean up for new structure for Aggregate and Filter