[TIMOB-13569] Code cleanup