removed travis_wait everywhere