Remove superfluous wait and run