Remove duplicates

Change-Id: I7bbd1d8ec97933aafb17a21c8b9b1f920d2cb59d