Remove FSM related code