Remove hard-coded aggregations from parser and ast

Remove hard-coded aggregations from parser and ast #3794