Final cleanup of aggregation framework