Clean up imports

Change-Id: I317beaa3e98bc5f496af95d3122b47c04226006f