Remove if-block of aggregator.aoi=True mode. Use one procedure for both aoi modes