Remove redundant state resolution function