Remove duplicates (6/17)

Remove duplicates