ClientConnection: some cleanup