Get rid of waiter