Remove unused import and unnecessary comment