Revert "Add initial framework for group-by and aggregate functions"

This reverts commit 02edf4b62b43420aa2fd26e9f2db7b45d9d8c52a.