[TIMOB-14098] Cleaned up messaging