cleanup, remove timed wait