Remove old group

Change-Id: I0b057c7de342c3870ab7e96c81fbf2bc9b4f9b90