Improve remove prompt behavior