Remove unused variable, fix import