remove redundant interactive waits