[TIMOB-14978] Some code cleanup.