minor clean up of messages