some messaging cleanup