Remove unused var and import