fix immediate message delivery
get rid of all old aggregator calls