[TIMOB-12218]Code Cleanup