[TIMOB-15741]Code cleanup. Removing deadcode