[Upg] Cleanup