[TIMOB-11771] Cleanup