remove unused import and cleanup