Remove dupes for 4.1
merge