Remove aggregator stuff for now