remove client-side message formatting, add more to server