[TIMOB-15480] Code cleanup