Renamed Aggregate2 to Aggregate
Removed dead code