remove waitfor (redundant)