Remove 25 unused imports, and clean up

Change-Id: If69129f700113d89e83b71c9390bbc8b95806626