Remove CompositeState.initial plus very minor refactor