clean-up, name, UI, plan name