Removed unused import and fix local issue