[UI] cleanup