try a further improvement to wait state removal.