Merge "Removed unused imports; whitespace normalization"