remove unused import and clean