[UI] Some cleanup