Cleaning up a few unused imports

Change-Id: If426c5056eea40a06fd7c18bef02ece0c1fad793
6 files changed