remove superfluous istate checking