TIMOB-14918: Removed unused code