removing many unnecessary wait_state