[TIMOB-18097]:  Code clean up