3.18: remove unused states and let client timeout on unhandled calls
into FSM