Updated version
Removing aggregation code - for 2.5.1