removing state machine from rma model