Fix duplicates

Change-Id: I1206fc0e51bcba4988b6bf11057dac9a4608fd0c