Minor clean up of messages from server