Fix waitfor; UT waitfor delete.