cleanup duplicates

Change-Id: I7f97cb9feabe267c67722d600d0891ab2ce1a907