Refactored out use of JSONObject in the protocol in favor of TextMessage.
Minor cleanup.