Remove duplication

Change-Id: I6c1542dbedbe97c13c509934ccde9260b7156668