get rid of the State structure