removed in feature/refactor-state-machine