[TIMOB-13435] Cleanup