Remove confusing combo buttons; add delete button (not tested)