Remove unused imports and fix some comments