blue: duplicate cleanup 2

Change-Id: Ic876c9ad66f1b7d1cc9ff4c4df8592d16b8fe147