remove unused import
fix missed var renaming