Cleanup and remove part of message