[TIMOB-11997] Code cleanup