Remove the state madness