Remove unused import and comment