Remove unused variable and import