Remove condition for state field handling MJ-375