remove Aggregate and GroupBy (todo: custom methods)