blue: duplicate cleanup

Change-Id: I851cd7ed501f1133bd0db8569aa878c6e28b5a53