[TG] Cleanup