Remove 32 Unused imports, and clean up

Change-Id: I79532eeb366c985a2acf6bd1d1b18679e926c03b