Fix up extra Group menu

Change-Id: I4f97742885aa4799817d482bbaeeda27c83542d5