Removed waiting list in chat, refactored.