Remove duplicates

(cherry picked from commit e017fdf7a8ea4f72e1ab9c4fb670f41b4fcc240d)