Properly clean spurious entries in waiting list