- Fixed Aggregator deletion and delegates