Remove unused imports

Change-Id: I0385538484d990e4eedcb2c4f62247534c3ea169