clean up double imports

Change-Id: I1d26be25d0851ae312e0646309a3501afe29ddde