Some clean up
Fixed guild not showing remote chat users.