Further Chat cleanup