Remove the last parts of groups support