- Mark it for actual removal in 1.11
- Tidy up some more todos
- Fix #3126 - duplicate stat id error - don't use the "universal