[TIMOB-12067] Code cleanup