PopupDialog: cleanup