Change the way we handle chat
Cleanup