Move connection clean up to ChatServer where it should be