remove conditional block around stateValue and use what's provided

close #358