remove unused import and move comment