Tweak incoming message cleaning logic