obsolete waiters class removed