Popupmnu cleanup