minimize use of SystemState
The goal is to eventually remove SystemState
but this removes stuff that is not being used anymore as progress in that direction.
The goal is to eventually remove SystemState
but this removes stuff that is not being used anymore as progress in that direction.