Cleanup messages

:fire: