deprecate wait option; remove dead code