Remove duplicates

Change-Id: Id34cf0ba47583190a6c4f326642776b6738d1f11