simplify unified timed wait code, drop support for newer method