Removed unused imports; whitespace normalization

Change-Id: I5e66c170e37f1382ec500cd6ae4a71435de7929f
4 files changed