Cleanup of aggregation handling.