[TIMOB-14587] Code cleanup