refactor OKEY reduced dublicated states