Add extra popups to foolproof removing