Remove unused import, and white space changes