Cleanup commented out code from obsolete group-by support