Removing aggregation related functions