Better removal UI and workflow