use uniq key; fix remove