If you go through these steps you shouldn’t be needed to clean stuff up afterwards
- Shut down home assistant
- Go to home-assistant/.storage
- Open core.entity_registry and core.device_registry
- Look for unique ids looking something like 12345EFFFF67890-/group/0
- Remove the four F so you get something like 12345E67890-/group/0
- Update home assistant and start it up again