Issue #2159369 by ParisLiakos: Move aggregator_refresh() and most of ->removeItems() logic to a service.