Functions which don't have grouping information is grouped as Actions

@benglin, please review.
Both these are not needed and should be removed. Please see my other comments below.