[TIMOB-13961] Code cleanup