fuji: duplicates cleanup

Change-Id: I7039d4b9567cebafae570d19956d42412eb3684e