CRUNCH-285: Clean up deprecated Aggregator/FilterFn code