TIMOB-14152: Code cleanup