aggregator: remove duplicated code fragment