Removed use of deprecated grand aggregates
Removed use of deprecated grand aggregates