White board (1.9/2):
25. Clean up on disconnect fix
28. Remove name on disconnect