[83041740] Simplify state