rename and remove unused import