Unused variable and import removed