cleaning up message stripping