Remove redundant TextMessage parsing