Remove unneeded groupId