Clean up imports

Change-Id: I8fc5796a45558d77814f2008262e61ccdb380999