Cleanup Arrange
Aggregates in grouped DataSource