Removing references to obsolete group stores