Remove use of NIState.