remove all state machine related logic