[TIMOB-1510] Cleanup