[TIMOB-11869] Small code cleanup.