Remove duplicates

Change-Id: I10ce56a97d3ebdb47dc0910767ec4b3cfc4284d7