Remove val-fn version of group-by