cleanup unused imports
fix unused var