[TIMOB-13066] Code cleanup