update and remove some dupes