[TIMOB-12259] Code cleanup