FSM cleanup: