Remove some redundancy check from the state machine