Merge "remove special case code for groups." into nyc-dev