Don't return an array when clear's are present in the message

Partially addresses #257