Final cleanup of aggregation framework

Ok, I removed it from mine