comment and messaging cleanup