UI-958: code cleanup after implementing the common control on group members