Remove custom Wait library completely and use async.