Removed unused and duplicated code from Aggregator